[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  e714dc0 s3-winbind: Do not return NO_MEMORY if we have an empty user list
      from  ef7e46d collect_tombstones: Allow links to recycled objects to be deleted

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e714dc03e0ccf9ec17da6bacc1bcfcaea7518e22
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Nov 2 17:19:09 2016 +0100

    s3-winbind: Do not return NO_MEMORY if we have an empty user list
    
    The domain child for the MACHINE ACCOUNT might fail with
    NT_STATUS_NO_MEMORY because an emtpy user list is returned.
    
    *pnum_info is already set to 0 at the beginngin so we should just
    declare victory here!
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12405
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu Nov  3 05:36:17 CET 2016 on sn-devel-144

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

Summary of changes:
 source3/winbindd/winbindd_rpc.c | 4 ++++
 1 file changed, 4 insertions(+)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index 386396a..7b355ba 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -88,6 +88,10 @@ NTSTATUS rpc_query_user_list(TALLOC_CTX *mem_ctx,
 		num_dom_users = disp_info.info1.count;
 
 		num_info += num_dom_users;
+		/* If there are no user to enumerate we're done */
+		if (num_info == 0) {
+			return NT_STATUS_OK;
+		}
 
 		info = talloc_realloc(mem_ctx,
 					    info,


-- 
Samba Shared Repository