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

[Günther Deschner]

The branch, v3-3-test has been updated
       via  d4594a7a03381fb251c9f8caf4c70e1ed97674b6 (commit)
      from  d01da44de77abbf724389bce924771f2975867f4 (commit)

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


- Log -----------------------------------------------------------------
commit d4594a7a03381fb251c9f8caf4c70e1ed97674b6
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jul 18 20:10:37 2008 +0200

    netapi: fix NetLocalGroupAdd.
    
    Guenther

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

Summary of changes:
 source/lib/netapi/localgroup.c |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/netapi/localgroup.c b/source/lib/netapi/localgroup.c
index fe36d86..5706762 100644
--- a/source/lib/netapi/localgroup.c
+++ b/source/lib/netapi/localgroup.c
@@ -209,6 +209,8 @@ WERROR NetLocalGroupAdd_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
+	init_lsa_String(&lsa_account_name, alias_name);
+
 	status = rpccli_samr_CreateDomAlias(pipe_cli, ctx,
 					    &domain_handle,
 					    &lsa_account_name,
@@ -786,6 +788,13 @@ WERROR NetLocalGroupEnum_r(struct libnetapi_ctx *ctx,
 			return WERR_UNKNOWN_LEVEL;
 	}
 
+	if (r->out.total_entries) {
+		*r->out.total_entries = 0;
+	}
+	if (r->out.entries_read) {
+		*r->out.entries_read = 0;
+	}
+
 	ZERO_STRUCT(connect_handle);
 	ZERO_STRUCT(builtin_handle);
 	ZERO_STRUCT(domain_handle);
@@ -836,6 +845,10 @@ WERROR NetLocalGroupEnum_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
+	if (r->out.total_entries) {
+		*r->out.total_entries += builtin_info->info2.num_aliases;
+	}
+
 	status = rpccli_samr_QueryDomainInfo(pipe_cli, ctx,
 					     &domain_handle,
 					     2,
@@ -845,6 +858,10 @@ WERROR NetLocalGroupEnum_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
+	if (r->out.total_entries) {
+		*r->out.total_entries += domain_info->info2.num_aliases;
+	}
+
 	status = rpccli_samr_EnumDomainAliases(pipe_cli, ctx,
 					       &builtin_handle,
 					       r->in.resume_handle,


-- 
Samba Shared Repository