[SCM] Samba Shared Repository - branch master updated

Matthias Dieter Wallnöfer mdw at samba.org
Wed Mar 10 12:36:38 MST 2010


The branch, master has been updated
       via  ec68434... s4:libnet - change variables to "unsigned" where needed
       via  af72a63... s4:libnet_become_dc - change counter variables to "unsigned" where they count LDB objects
      from  5d10676... s4:winreg RPC - fix up the "QueryValue" call to work against the enhanced torture test

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


- Log -----------------------------------------------------------------
commit ec6843402cdaecf8fa96f7b9c037f175dd128639
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Wed Mar 10 20:23:43 2010 +0100

    s4:libnet - change variables to "unsigned" where needed

commit af72a63cff2e8a000232d4ea65b66fb87eda9f01
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Wed Mar 10 20:22:06 2010 +0100

    s4:libnet_become_dc - change counter variables to "unsigned" where they count LDB objects

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

Summary of changes:
 source4/libnet/libnet_become_dc.c   |    4 ++--
 source4/libnet/libnet_domain.c      |    2 +-
 source4/libnet/libnet_group.c       |    2 +-
 source4/libnet/libnet_join.c        |    2 +-
 source4/libnet/libnet_passwd.c      |    2 +-
 source4/libnet/libnet_samsync.c     |    4 ++--
 source4/libnet/libnet_samsync_ldb.c |    9 +++++----
 source4/libnet/libnet_site.c        |    2 +-
 source4/libnet/libnet_unbecome_dc.c |    2 +-
 source4/libnet/libnet_user.c        |    2 +-
 10 files changed, 16 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c
index 8eac1fd..1721e82 100644
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -1437,7 +1437,7 @@ static NTSTATUS becomeDC_ldap1_server_object_modify(struct libnet_BecomeDC_state
 {
 	int ret;
 	struct ldb_message *msg;
-	uint32_t i;
+	unsigned int i;
 
 	/* make a 'modify' msg, and only for serverReference */
 	msg = ldb_msg_new(s);
@@ -2891,7 +2891,7 @@ static NTSTATUS becomeDC_ldap2_modify_computer(struct libnet_BecomeDC_state *s)
 {
 	int ret;
 	struct ldb_message *msg;
-	uint32_t i;
+	unsigned int i;
 	uint32_t user_account_control = UF_SERVER_TRUST_ACCOUNT |
 					UF_TRUSTED_FOR_DELEGATION;
 
diff --git a/source4/libnet/libnet_domain.c b/source4/libnet/libnet_domain.c
index cae8d2c..ab168b5 100644
--- a/source4/libnet/libnet_domain.c
+++ b/source4/libnet/libnet_domain.c
@@ -1116,7 +1116,7 @@ static void continue_samr_close_handle(struct rpc_request *req)
 */
 static struct domainlist* get_domain_list(TALLOC_CTX *mem_ctx, struct domain_list_state *s)
 {
-	int i;
+	uint32_t i;
 	if (mem_ctx == NULL || s == NULL) return NULL;
 
 	/* prepare domains array */
diff --git a/source4/libnet/libnet_group.c b/source4/libnet/libnet_group.c
index 9e2c696..fd37b46 100644
--- a/source4/libnet/libnet_group.c
+++ b/source4/libnet/libnet_group.c
@@ -624,7 +624,7 @@ static void continue_groups_enumerated(struct rpc_request *req)
 {
 	struct composite_context *c;
 	struct grouplist_state *s;
-	int i;
+	uint32_t i;
 
 	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct grouplist_state);
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index e26dd9d..8159df2 100644
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -289,7 +289,7 @@ static NTSTATUS libnet_JoinADSDomain(struct libnet_context *ctx, struct libnet_J
 	msg->dn = res->msgs[0]->dn;
 
 	{
-		int i;
+		unsigned int i;
 		const char *service_principal_name[6];
 		const char *dns_host_name = strlower_talloc(tmp_ctx, 
 							    talloc_asprintf(tmp_ctx, 
diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c
index 8195347..1fff4f8 100644
--- a/source4/libnet/libnet_passwd.c
+++ b/source4/libnet/libnet_passwd.c
@@ -463,7 +463,7 @@ static NTSTATUS libnet_SetPassword_samr_handle(struct libnet_context *ctx, TALLO
 		LIBNET_SET_PASSWORD_SAMR_HANDLE_24,
 		LIBNET_SET_PASSWORD_SAMR_HANDLE_23,
 	};
-	int i;
+	unsigned int i;
 
 	for (i=0; i < ARRAY_SIZE(levels); i++) {
 		r->generic.level = levels[i];
diff --git a/source4/libnet/libnet_samsync.c b/source4/libnet/libnet_samsync.c
index bdfb46d..706d9bb 100644
--- a/source4/libnet/libnet_samsync.c
+++ b/source4/libnet/libnet_samsync.c
@@ -45,7 +45,7 @@ NTSTATUS libnet_SamSync_netlogon(struct libnet_context *ctx, TALLOC_CTX *mem_ctx
 	struct libnet_RpcConnect *c;
 	struct libnet_SamSync_state *state;
 	const enum netr_SamDatabaseID database_ids[] = {SAM_DATABASE_DOMAIN, SAM_DATABASE_BUILTIN, SAM_DATABASE_PRIVS}; 
-	int i;
+	unsigned int i;
 
 	samsync_ctx = talloc_named(mem_ctx, 0, "SamSync top context");
 
@@ -209,7 +209,7 @@ NTSTATUS libnet_SamSync_netlogon(struct libnet_context *ctx, TALLOC_CTX *mem_ctx
 		dbsync.out.sync_context = &sync_context;
 		
 		do {
-			int d;
+			uint32_t d;
 			loop_ctx = talloc_named(samsync_ctx, 0, "DatabaseSync loop context");
 			netlogon_creds_client_authenticator(creds, &credential);
 
diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c
index e9db4a9..fa39375 100644
--- a/source4/libnet/libnet_samsync_ldb.c
+++ b/source4/libnet/libnet_samsync_ldb.c
@@ -245,7 +245,8 @@ static NTSTATUS samsync_ldb_handle_user(TALLOC_CTX *mem_ctx,
 	struct ldb_message *msg;
 	struct ldb_message **msgs;
 	struct ldb_message **remote_msgs = NULL;
-	int ret, i;
+	unsigned int i;
+	int ret;
 	uint32_t acb;
 	bool add = false;
 	const char *attrs[] = { NULL };
@@ -658,7 +659,7 @@ static NTSTATUS samsync_ldb_handle_group_member(TALLOC_CTX *mem_ctx,
 	struct ldb_message **msgs;
 	int ret;
 	const char *attrs[] = { NULL };
-	int i;
+	uint32_t i;
 
 	msg = ldb_msg_new(mem_ctx);
 	if (msg == NULL) {
@@ -867,7 +868,7 @@ static NTSTATUS samsync_ldb_handle_alias_member(TALLOC_CTX *mem_ctx,
 	struct ldb_message **msgs;
 	int ret;
 	const char *attrs[] = { NULL };
-	int i;
+	uint32_t i;
 
 	msg = ldb_msg_new(mem_ctx);
 	if (msg == NULL) {
@@ -948,7 +949,7 @@ static NTSTATUS samsync_ldb_handle_account(TALLOC_CTX *mem_ctx,
 
 	struct ldb_message *msg;
 	int ret;
-	int i;
+	uint32_t i;
 	char *dnstr, *sidstr;
 
 	msg = ldb_msg_new(mem_ctx);
diff --git a/source4/libnet/libnet_site.c b/source4/libnet/libnet_site.c
index 410fb4b..67935b2 100644
--- a/source4/libnet/libnet_site.c
+++ b/source4/libnet/libnet_site.c
@@ -235,7 +235,7 @@ NTSTATUS libnet_JoinSite(struct libnet_context *ctx,
 
 	rtn = ldb_add(remote_ldb, msg);
 	if (rtn == LDB_ERR_ENTRY_ALREADY_EXISTS) {
-		int i;
+		unsigned int i;
 
 		/* make a 'modify' msg, and only for serverReference */
 		msg = ldb_msg_new(tmp_ctx);
diff --git a/source4/libnet/libnet_unbecome_dc.c b/source4/libnet/libnet_unbecome_dc.c
index 3aa65c6..0695ec7 100644
--- a/source4/libnet/libnet_unbecome_dc.c
+++ b/source4/libnet/libnet_unbecome_dc.c
@@ -419,7 +419,7 @@ static NTSTATUS unbecomeDC_ldap_modify_computer(struct libnet_UnbecomeDC_state *
 	int ret;
 	struct ldb_message *msg;
 	uint32_t user_account_control = UF_WORKSTATION_TRUST_ACCOUNT;
-	uint32_t i;
+	unsigned int i;
 
 	/* as the value is already as we want it to be, we're done */
 	if (s->dest_dsa.user_account_control == user_account_control) {
diff --git a/source4/libnet/libnet_user.c b/source4/libnet/libnet_user.c
index 2bc7eea..f52010e 100644
--- a/source4/libnet/libnet_user.c
+++ b/source4/libnet/libnet_user.c
@@ -1088,7 +1088,7 @@ static void continue_users_enumerated(struct rpc_request *req)
 {
 	struct composite_context *c;
 	struct userlist_state *s;
-	int i;
+	uint32_t i;
 
 	c = talloc_get_type(req->async.private_data, struct composite_context);
 	s = talloc_get_type(c->private_data, struct userlist_state);


-- 
Samba Shared Repository


More information about the samba-cvs mailing list