components/samba/samba36/patches/16298670_id-a.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 10 Jun 2015 16:30:48 -0700
changeset 4463 0f8d88e8430f
parent 4433 components/samba/samba/samba36/patches/16298670_id-a.patch@d35242d8330c
permissions -rw-r--r--
18462092 Update to Samba 4. (fix samba36 build)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4433
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     1
https://bugzilla.samba.org/show_bug.cgi?id=10487
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     2
Common synopsis:  Samba Winbind GETGRENT interface fails when any trusted domain is not available
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     3
Bugs 16298670, 18191913
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     4
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     5
--- a/nsswitch/wb_common.c	2014-02-07 17:26:50.046234000 +0100
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     6
+++ b/nsswitch/wb_common.c	2014-02-07 17:33:40.280002000 +0100
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     7
@@ -462,7 +462,7 @@
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     8
 
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     9
 		if (ret == 0) {
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    10
 			/* Not ready for read yet... */
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    11
-			if (total_time >= 30) {
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    12
+			if (total_time >= 1000) {
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    13
 				/* Timeout */
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    14
 				winbind_close_sock();
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    15
 				return -1;
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    16
--- a/source3/winbindd/wb_next_grent.c	2014-02-07 17:27:14.079647000 +0100
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    17
+++ b/source3/winbindd/wb_next_grent.c	2014-02-07 17:58:36.599520000 +0100
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    18
@@ -103,18 +103,16 @@
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    19
 	TALLOC_FREE(subreq);
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    20
 	if (tevent_req_nterror(req, status)) {
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    21
 		/* Ignore errors here, just log it */
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    22
-		DEBUG(10, ("query_user_list for domain %s returned %s\n",
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    23
+		DEBUG(3, ("query_user_list for domain %s returned: %s\n",
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    24
 			   state->gstate->domain->name,
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    25
 			   nt_errstr(status)));
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    26
-		return;
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    27
 	}
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    28
 	if (!NT_STATUS_IS_OK(result)) {
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    29
 		/* Ignore errors here, just log it */
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    30
-		DEBUG(10, ("query_user_list for domain %s returned %s/%s\n",
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    31
+		DEBUG(1, ("query_user_list for domain %s failed with: %s/%s\n",
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    32
 			   state->gstate->domain->name,
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    33
 			   nt_errstr(status), nt_errstr(result)));
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    34
-		tevent_req_nterror(req, result);
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    35
-		return;
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    36
+		state->gstate->num_groups = 0;
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    37
 	}
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    38
 
d35242d8330c PSARC/2015/008 Update Samba to release 4
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
    39
 	state->gstate->num_groups = state->next_groups.num_principals;