[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  1a996fe s3: Fix getent group if trusted domains are not reachable
      from  a0a7996 Fix bug 8412 - Microsoft Office 2007 (Microsoft Word) fails to save as on a Samba share with SMB2. (cherry picked from commit dec3b21cd1737b317749e7ebced5aa1c2115ebdf)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 1a996fe1d12a55e68b7266ce5db8972b6e5f101a
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Aug 25 20:13:09 2011 +0200

    s3: Fix getent group if trusted domains are not reachable
    
    Fix bug #8420 (wb_group_members: non-resistance against garbage).

-----------------------------------------------------------------------

Summary of changes:
 source3/winbindd/wb_group_members.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/wb_group_members.c b/source3/winbindd/wb_group_members.c
index e6efcab..8776a8c 100644
--- a/source3/winbindd/wb_group_members.c
+++ b/source3/winbindd/wb_group_members.c
@@ -209,8 +209,13 @@ static void wb_groups_members_done(struct tevent_req *subreq)
 	 * and just continue if an error occured.
 	 */
 
-	if (tevent_req_nterror(req, status)) {
-		return;
+	if (!NT_STATUS_IS_OK(status)) {
+		if (!NT_STATUS_EQUAL(
+			    status, NT_STATUS_TRUSTED_DOMAIN_FAILURE)) {
+			tevent_req_nterror(req, status);
+			return;
+		}
+		num_members = 0;
 	}
 
 	num_all_members = talloc_array_length(state->all_members);


-- 
Samba Shared Repository