[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4283-g9d325ae

[Günther Deschner]

The branch, v3-3-test has been updated
       via  9d325aef4ba694c6adfc0b951baafdee9057ed43 (commit)
       via  8a0054c6d273049bea235803db25912f6cf03610 (commit)
      from  7693d853933e1d7ece9261847bab53e2b73dfa50 (commit)

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


- Log -----------------------------------------------------------------
commit 9d325aef4ba694c6adfc0b951baafdee9057ed43
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 23 01:43:06 2008 +0200

    netapi: NetGroupEnum_r needs to handle servers with no groups.
    
    Guenther

commit 8a0054c6d273049bea235803db25912f6cf03610
Author: Günther Deschner <gd at samba.org>
Date:   Thu Oct 23 01:42:27 2008 +0200

    s3-samr-server: _samr_DeleteUser needs to wipe out the user_handle on success.
    
    Guenther

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

Summary of changes:
 source/lib/netapi/group.c       |    2 +-
 source/rpc_server/srv_samr_nt.c |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/netapi/group.c b/source/lib/netapi/group.c
index c3fccb4..a78c784 100644
--- a/source/lib/netapi/group.c
+++ b/source/lib/netapi/group.c
@@ -1243,7 +1243,7 @@ WERROR NetGroupEnum_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	if (r->out.resume_handle) {
+	if (r->out.resume_handle && info.info3.count > 0) {
 		*r->out.resume_handle =
 			info.info3.entries[info.info3.count-1].idx;
 	}
diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index 5312b0a..86e5d83 100644
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -4908,6 +4908,8 @@ NTSTATUS _samr_DeleteUser(pipes_struct *p,
 	if (!close_policy_hnd(p, r->in.user_handle))
 		return NT_STATUS_OBJECT_NAME_INVALID;
 
+	ZERO_STRUCTP(r->out.user_handle);
+
 	force_flush_samr_cache(disp_info);
 
 	return NT_STATUS_OK;


-- 
Samba Shared Repository