[SCM] Samba Shared Repository - branch v3-0-test updated - initial-v3-0-unstable-13-gc3fbfc3

[Gerald (Jerry) Carter]

The branch, v3-0-test has been updated
       via  c3fbfc37b578b8107be1f585cf6e3e2d001f7ab1 (commit)
       via  8cb09fe2d923fabbb6a7b909cc245c08128c0b67 (commit)
      from  26d8a1ad20c10da495970c584983fbd261b4946e (commit)

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


- Log -----------------------------------------------------------------
commit c3fbfc37b578b8107be1f585cf6e3e2d001f7ab1
Merge: 8cb09fe2d923fabbb6a7b909cc245c08128c0b67 26d8a1ad20c10da495970c584983fbd261b4946e
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date:   Tue Oct 30 22:22:43 2007 -0400

    Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test

commit 8cb09fe2d923fabbb6a7b909cc245c08128c0b67
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date:   Tue Oct 30 22:21:49 2007 -0400

    Ensure we catch an error in the query_user() reply in the receive function.
    backport of v3-2-test patch from Dmitry Butskoy <buc at odusz.so-cdu.ru>.

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

Summary of changes:
 source/nsswitch/winbindd_async.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nsswitch/winbindd_async.c b/source/nsswitch/winbindd_async.c
index eb8631a..32d4e66 100644
--- a/source/nsswitch/winbindd_async.c
+++ b/source/nsswitch/winbindd_async.c
@@ -1413,6 +1413,12 @@ static void query_user_recv(TALLOC_CTX *mem_ctx, BOOL success,
 		return;
 	}
 
+	if (response->result != WINBINDD_OK) {
+		DEBUG(5, ("query_user returned an error\n"));
+		cont(private_data, False, NULL, NULL, NULL, NULL, -1, -1);
+		return;
+	}
+
 	cont(private_data, True, response->data.user_info.acct_name,
 	     response->data.user_info.full_name,
 	     response->data.user_info.homedir,


-- 
Samba Shared Repository