r11137: Compile with only 2 warnings (I'm still working on that code) on a gcc4

x86_64 box.
Jeremy.
(This used to be commit d720867a788c735e56d53d63265255830ec21208)

9 files changed, 17 insertions, 17 deletions

diff --git a/source3/utils/net_ads_cldap.c b/source3/utils/net_ads_cldap.c
index 9585a8bc76..9f70a5b725 100644
--- a/source3/utils/net_ads_cldap.c
+++ b/source3/utils/net_ads_cldap.c
@@ -202,7 +202,7 @@ static int recv_cldap_netlogon(int sock, struct cldap_netlogon_reply *reply)
 	ASN1_DATA data;
 	DATA_BLOB blob;
 	DATA_BLOB os1, os2, os3;
-	uint32 i1;
+	int i1;
 	char *p;
 
 	blob = data_blob(NULL, 8192);
diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c
index b08673b2bb..12c3c79ef4 100644
--- a/source3/utils/net_groupmap.c
+++ b/source3/utils/net_groupmap.c
@@ -109,9 +109,9 @@ static void print_map_entry ( GROUP_MAP map, BOOL long_list )
 **********************************************************/
 static int net_groupmap_list(int argc, const char **argv)
 {
-	int entries;
+	size_t entries;
 	BOOL long_list = False;
-	int i;
+	size_t i;
 	fstring ntgroup = "";
 	fstring sid_string = "";
 
@@ -597,7 +597,7 @@ static int net_groupmap_set(int argc, const char **argv)
 static int net_groupmap_cleanup(int argc, const char **argv)
 {
 	GROUP_MAP *map = NULL;
-	int i, entries;
+	size_t i, entries;
 
 	if (!pdb_enum_group_mapping(SID_NAME_UNKNOWN, &map, &entries,
 				    ENUM_ALL_MAPPED)) {
@@ -670,7 +670,7 @@ static int net_groupmap_listmem(int argc, const char **argv)
 {
 	DOM_SID alias;
 	DOM_SID *members;
-	int i, num;
+	size_t i, num;
 
 	if ( (argc != 1) || 
 	     !string_to_sid(&alias, argv[0]) ) {
@@ -697,7 +697,7 @@ static BOOL print_alias_memberships(TALLOC_CTX *mem_ctx,
 				    const DOM_SID *member)
 {
 	uint32 *alias_rids;
-	int i, num_alias_rids;
+	size_t i, num_alias_rids;
 
 	alias_rids = NULL;
 	num_alias_rids = 0;
diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c
index 7abb31ab3d..0ee180e13e 100644
--- a/source3/utils/net_idmap.c
+++ b/source3/utils/net_idmap.c
@@ -76,8 +76,8 @@ static int net_idmap_dump(int argc, const char **argv)
 
 struct hwms {
 	BOOL ok;
-	int user_hwm;
-	int group_hwm;
+	uid_t user_hwm;
+	gid_t group_hwm;
 };
 
 static int net_idmap_find_max_id(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA data,
@@ -160,8 +160,8 @@ static NTSTATUS net_idmap_fixup_hwm(void)
 		goto done;
 	}
 
-	if ((tdb_store_int32(idmap_tdb, "USER HWM", hwms.user_hwm) != 0) ||
-	    (tdb_store_int32(idmap_tdb, "GROUP HWM", hwms.group_hwm) != 0)) {
+	if ((tdb_store_int32(idmap_tdb, "USER HWM", (int32)hwms.user_hwm) != 0) ||
+	    (tdb_store_int32(idmap_tdb, "GROUP HWM", (int32)hwms.group_hwm) != 0)) {
 		d_printf("Could not store HWMs\n");
 		goto done;
 	}
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 54af5c4df1..33eac56a92 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -4800,7 +4800,7 @@ static NTSTATUS rpc_trustdom_add_internals(const DOM_SID *domain_sid,
 		LOGON_HRS hrs;
 		uchar pwbuf[516];
 
-		encode_pw_buffer((char *)pwbuf, argv[1], STR_UNICODE);
+		encode_pw_buffer(pwbuf, argv[1], STR_UNICODE);
 
 		ZERO_STRUCT(ctr);
 		ZERO_STRUCT(p23);
diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c
index 33ccb6c1b7..7397c88d95 100644
--- a/source3/utils/net_rpc_registry.c
+++ b/source3/utils/net_rpc_registry.c
@@ -357,7 +357,7 @@ static BOOL write_registry_tree( REGF_FILE *infile, REGF_NK_REC *nk,
 	
 	for ( i=0; i<nk->num_values; i++ ) {
 		regval_ctr_addvalue( values, nk->values[i].valuename, nk->values[i].type,
-			nk->values[i].data, (nk->values[i].data_size & ~VK_DATA_IN_OFFSET) );
+			(const char *)nk->values[i].data, (nk->values[i].data_size & ~VK_DATA_IN_OFFSET) );
 	}
 
 	/* copy subkeys into the REGSUBKEY_CTR */
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 4f3bb4d414..41203dac74 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -755,7 +755,7 @@ static void offer_gss_spnego_mechs(void) {
 
 	/* Server negTokenInit (mech offerings) */
 	spnego.type = SPNEGO_NEG_TOKEN_INIT;
-	spnego.negTokenInit.mechTypes = SMB_XMALLOC_ARRAY(char *, 2);
+	spnego.negTokenInit.mechTypes = SMB_XMALLOC_ARRAY(const char *, 2);
 #ifdef HAVE_KRB5
 	spnego.negTokenInit.mechTypes[0] = smb_xstrdup(OID_KERBEROS5_OLD);
 	spnego.negTokenInit.mechTypes[1] = smb_xstrdup(OID_NTLMSSP);
@@ -1056,7 +1056,7 @@ static BOOL manage_client_ntlmssp_init(SPNEGO_DATA spnego)
 	}
 
 	spnego.type = SPNEGO_NEG_TOKEN_INIT;
-	spnego.negTokenInit.mechTypes = CONST_DISCARD(char **,my_mechs);
+	spnego.negTokenInit.mechTypes = my_mechs;
 	spnego.negTokenInit.reqFlags = 0;
 	spnego.negTokenInit.mechListMIC = null_blob;
 
diff --git a/source3/utils/ntlm_auth_diagnostics.c b/source3/utils/ntlm_auth_diagnostics.c
index 7fae0ede97..95f1355c2e 100644
--- a/source3/utils/ntlm_auth_diagnostics.c
+++ b/source3/utils/ntlm_auth_diagnostics.c
@@ -476,7 +476,7 @@ static BOOL test_plaintext(enum ntlm_break break_which)
 
 	SAFE_FREE(password);
 
-	lm_response.length = strlen(lm_response.data);
+	lm_response.length = strlen((const char *)lm_response.data);
 
 	switch (break_which) {
 	case BREAK_NONE:
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index dacaa1e26f..6e08712bc4 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -100,7 +100,7 @@ static int export_database (struct pdb_context *in, struct pdb_context
 
 static int export_groups (struct pdb_context *in, struct pdb_context *out) {
 	GROUP_MAP *maps = NULL;
-	int i, entries = 0;
+	size_t i, entries = 0;
 
 	if (NT_STATUS_IS_ERR(in->pdb_enum_group_mapping(in, SID_NAME_UNKNOWN,
 							&maps, &entries,
diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c
index 6bf9e44a14..05971b0d2e 100644
--- a/source3/utils/profiles.c
+++ b/source3/utils/profiles.c
@@ -96,7 +96,7 @@ static BOOL copy_registry_tree( REGF_FILE *infile, REGF_NK_REC *nk,
 
 	for ( i=0; i<nk->num_values; i++ ) {
 		regval_ctr_addvalue( values, nk->values[i].valuename, nk->values[i].type,
-			nk->values[i].data, (nk->values[i].data_size & ~VK_DATA_IN_OFFSET) );
+			(const char *)nk->values[i].data, (nk->values[i].data_size & ~VK_DATA_IN_OFFSET) );
 	}
 
 	/* copy subkeys into the REGSUBKEY_CTR */