The branch, v3-6-test has been updated via 7182f08 s3:winbindd: fix query_user for users with NULL full name. via 551bb0d s3:winbindd: fix query_user_list for users with NULL full_name (cherry picked from commit 53d19fac5f97ca234b75046602455653e2a0b2e7) from 29fc7ae Fix bug #7700 - Improvement of return code of smbclient
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log ----------------------------------------------------------------- commit 7182f0885e17d5ffe2af491a06a6df1769350e17 Author: Michael Adam <ob...@samba.org> Date: Mon Nov 1 12:33:43 2010 +0100 s3:winbindd: fix query_user for users with NULL full name. Not sure whether query_user ever sends a NULL full name. Query Display Info does, and it does not harm to add the check here, too. Autobuild-User: Michael Adam <ob...@samba.org> Autobuild-Date: Mon Nov 1 13:03:33 UTC 2010 on sn-devel-104 (cherry picked from commit 1ccb69aabb9057d272fc584d648a4ed9ffc0f3b7) commit 551bb0db7872aa12ed182be817c51f22bd81dcb6 Author: Michael Adam <ob...@samba.org> Date: Mon Nov 1 12:31:34 2010 +0100 s3:winbindd: fix query_user_list for users with NULL full_name (cherry picked from commit 53d19fac5f97ca234b75046602455653e2a0b2e7) ----------------------------------------------------------------------- Summary of changes: source3/winbindd/winbindd_rpc.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c index 15c0424..711ec27 100644 --- a/source3/winbindd/winbindd_rpc.c +++ b/source3/winbindd/winbindd_rpc.c @@ -108,7 +108,9 @@ NTSTATUS rpc_query_user_list(TALLOC_CTX *mem_ctx, } dst->full_name = talloc_strdup(info, src->full_name.string); - if (dst->full_name == NULL) { + if ((src->full_name.string != NULL) && + (dst->full_name == NULL)) + { return NT_STATUS_NO_MEMORY; } @@ -499,7 +501,9 @@ NTSTATUS rpc_query_user(TALLOC_CTX *mem_ctx, user_info->full_name = talloc_strdup(user_info, info->info21.full_name.string); - if (user_info->acct_name == NULL) { + if ((info->info21.full_name.string != NULL) && + (user_info->acct_name == NULL)) + { return NT_STATUS_NO_MEMORY; } -- Samba Shared Repository