[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  c9b1ab0 libcli/security: Make add_sid_to_array_unique use a uin32_t counter
       via  e1fad19 libcli/security: Make del_sid_from_array take a uint32_t
       via  ac00174 s3:net conf: fix a comment typo (cherry picked from commit 3bccd2f3f365d5b8f227d0ddf9397921c1622c44)
      from  0655e11 s3: Make "endpoint_table" static

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


- Log -----------------------------------------------------------------
commit c9b1ab02ef2fa88d0e6820d874e6a6c4665096e3
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Feb 3 05:23:50 2011 -0700

    libcli/security: Make add_sid_to_array_unique use a uin32_t counter
    
    Logical consequence of the previous commit
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User: Michael Adam <obnox at samba.org>
    Autobuild-Date: Mon Feb  7 19:24:19 CET 2011 on sn-devel-104
    (cherry picked from commit 1d58fcc9259d929093d381f0bd6690345e7c8040)

commit e1fad192989c59ab3af38498dbcd255d6940de42
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Feb 3 05:22:36 2011 -0700

    libcli/security: Make del_sid_from_array take a uint32_t
    
    This aligns it with add_sid_to_array
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    (cherry picked from commit 91a56b420a7a6f71d69b0bb88143748d834d4a80)

commit ac001745b07b481125ae48afa12faac8e6770bbd
Author: Michael Adam <obnox at samba.org>
Date:   Mon Feb 7 13:30:11 2011 +0100

    s3:net conf: fix a comment typo
    (cherry picked from commit 3bccd2f3f365d5b8f227d0ddf9397921c1622c44)

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

Summary of changes:
 libcli/security/dom_sid.h  |    3 ++-
 libcli/security/util_sid.c |    7 ++++---
 source3/utils/net_conf.c   |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/security/dom_sid.h b/libcli/security/dom_sid.h
index 8d59b18..c65471b 100644
--- a/libcli/security/dom_sid.h
+++ b/libcli/security/dom_sid.h
@@ -89,7 +89,8 @@ NTSTATUS add_sid_to_array(TALLOC_CTX *mem_ctx, const struct dom_sid *sid,
 			  struct dom_sid **sids, uint32_t *num);
 NTSTATUS add_sid_to_array_unique(TALLOC_CTX *mem_ctx, const struct dom_sid *sid,
 				 struct dom_sid **sids, uint32_t *num_sids);
-void del_sid_from_array(const struct dom_sid *sid, struct dom_sid **sids, size_t *num);
+void del_sid_from_array(const struct dom_sid *sid, struct dom_sid **sids,
+			uint32_t *num);
 bool add_rid_to_array_unique(TALLOC_CTX *mem_ctx,
 			     uint32_t rid, uint32_t **pp_rids, size_t *p_num);
 bool is_null_sid(const struct dom_sid *sid);
diff --git a/libcli/security/util_sid.c b/libcli/security/util_sid.c
index 3d14536..535e81c 100644
--- a/libcli/security/util_sid.c
+++ b/libcli/security/util_sid.c
@@ -310,7 +310,7 @@ NTSTATUS add_sid_to_array(TALLOC_CTX *mem_ctx, const struct dom_sid *sid,
 NTSTATUS add_sid_to_array_unique(TALLOC_CTX *mem_ctx, const struct dom_sid *sid,
 				 struct dom_sid **sids, uint32_t *num_sids)
 {
-	size_t i;
+	uint32_t i;
 
 	for (i=0; i<(*num_sids); i++) {
 		if (dom_sid_compare(sid, &(*sids)[i]) == 0)
@@ -324,10 +324,11 @@ NTSTATUS add_sid_to_array_unique(TALLOC_CTX *mem_ctx, const struct dom_sid *sid,
  Remove SID from an array
 ********************************************************************/
 
-void del_sid_from_array(const struct dom_sid *sid, struct dom_sid **sids, size_t *num)
+void del_sid_from_array(const struct dom_sid *sid, struct dom_sid **sids,
+			uint32_t *num)
 {
 	struct dom_sid *sid_list = *sids;
-	size_t i;
+	uint32_t i;
 
 	for ( i=0; i<*num; i++ ) {
 
diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 58e8cad..9e536b7 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -398,7 +398,7 @@ static int net_conf_import(struct net_context *c, struct smbconf_ctx *conf_ctx,
 
 		/*
 		 * Wrap the importing of shares into a transaction,
-		 * but only 100 at a time, in order to serve memory.
+		 * but only 100 at a time, in order to save memory.
 		 * The allocated memory accumulates across the actions
 		 * within the transaction, and for me, some 1500
 		 * imported shares, the MAX_TALLOC_SIZE of 256 MB


-- 
Samba Shared Repository