r22001: change prototype of dump_data(), so that it takes unsigned char * now,

which matches what samba4 has.

also fix all the callers to prevent compiler warnings

metze
(This used to be commit fa322f0cc9c26a9537ba3f0a7d4e4a25941317e7)

2 files changed, 16 insertions, 16 deletions

diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 1f0a915574..2bdbdc0422 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -761,7 +761,7 @@ static void manage_squid_ntlmssp_request(enum stdio_helper_mode stdio_helper_mod
 	}
 
 	DEBUG(10, ("got NTLMSSP packet:\n"));
-	dump_data(10, (const char *)request.data, request.length);
+	dump_data(10, request.data, request.length);
 
 	nt_status = ntlmssp_update(ntlmssp_state, request, &reply);
 	
@@ -914,7 +914,7 @@ static void manage_client_ntlmssp_request(enum stdio_helper_mode stdio_helper_mo
 	}
 
 	DEBUG(10, ("got NTLMSSP packet:\n"));
-	dump_data(10, (const char *)request.data, request.length);
+	dump_data(10, request.data, request.length);
 
 	if (use_cached_creds && !opt_password && !first) {
 		nt_status = do_ccache_ntlm_auth(initial_message, request, &reply);
@@ -1135,7 +1135,7 @@ static void manage_gss_spnego_request(enum stdio_helper_mode stdio_helper_mode,
 			}
 
 			DEBUG(10, ("got NTLMSSP packet:\n"));
-			dump_data(10, (const char *)request.negTokenInit.mechToken.data,
+			dump_data(10, request.negTokenInit.mechToken.data,
 				  request.negTokenInit.mechToken.length);
 
 			response.type = SPNEGO_NEG_TOKEN_TARG;
diff --git a/source3/utils/ntlm_auth_diagnostics.c b/source3/utils/ntlm_auth_diagnostics.c
index 6f829de1dd..0ebe77b0d1 100644
--- a/source3/utils/ntlm_auth_diagnostics.c
+++ b/source3/utils/ntlm_auth_diagnostics.c
@@ -116,9 +116,9 @@ static BOOL test_lm_ntlm_broken(enum ntlm_break break_which)
 		   sizeof(lm_key)) != 0) {
 		DEBUG(1, ("LM Key does not match expectations!\n"));
  		DEBUG(1, ("lm_key:\n"));
-		dump_data(1, (const char *)lm_key, 8);
+		dump_data(1, lm_key, 8);
 		DEBUG(1, ("expected:\n"));
-		dump_data(1, (const char *)lm_hash, 8);
+		dump_data(1, lm_hash, 8);
 		pass = False;
 	}
 
@@ -127,9 +127,9 @@ static BOOL test_lm_ntlm_broken(enum ntlm_break break_which)
 			   8) != 0) {
 			DEBUG(1, ("NT Session Key does not match expectations (should be LM hash)!\n"));
 			DEBUG(1, ("user_session_key:\n"));
-			dump_data(1, (const char *)user_session_key, sizeof(user_session_key));
+			dump_data(1, user_session_key, sizeof(user_session_key));
 			DEBUG(1, ("expected:\n"));
-			dump_data(1, (const char *)lm_hash, sizeof(lm_hash));
+			dump_data(1, lm_hash, sizeof(lm_hash));
 			pass = False;
 		}
 	} else {		
@@ -137,9 +137,9 @@ static BOOL test_lm_ntlm_broken(enum ntlm_break break_which)
 			   sizeof(user_session_key)) != 0) {
 			DEBUG(1, ("NT Session Key does not match expectations!\n"));
 			DEBUG(1, ("user_session_key:\n"));
-			dump_data(1, (const char *)user_session_key, 16);
+			dump_data(1, user_session_key, 16);
 			DEBUG(1, ("expected:\n"));
-			dump_data(1, (const char *)session_key.data, session_key.length);
+			dump_data(1, session_key.data, session_key.length);
 			pass = False;
 		}
 	}
@@ -215,17 +215,17 @@ static BOOL test_ntlm_in_lm(void)
 		   sizeof(lm_key)) != 0) {
 		DEBUG(1, ("LM Key does not match expectations!\n"));
  		DEBUG(1, ("lm_key:\n"));
-		dump_data(1, (const char *)lm_key, 8);
+		dump_data(1, lm_key, 8);
 		DEBUG(1, ("expected:\n"));
-		dump_data(1, (const char *)lm_hash, 8);
+		dump_data(1, lm_hash, 8);
 		pass = False;
 	}
 	if (memcmp(lm_hash, user_session_key, 8) != 0) {
 		DEBUG(1, ("Session Key (first 8 lm hash) does not match expectations!\n"));
  		DEBUG(1, ("user_session_key:\n"));
-		dump_data(1, (const char *)user_session_key, 16);
+		dump_data(1, user_session_key, 16);
  		DEBUG(1, ("expected:\n"));
-		dump_data(1, (const char *)lm_hash, 8);
+		dump_data(1, lm_hash, 8);
 		pass = False;
 	}
         return pass;
@@ -297,7 +297,7 @@ static BOOL test_ntlm_in_both(void)
  		DEBUG(1, ("user_session_key:\n"));
 		dump_data(1, user_session_key, 16);
  		DEBUG(1, ("expected:\n"));
-		dump_data(1, (const char *)session_key.data, session_key.length);
+		dump_data(1, session_key.data, session_key.length);
 		pass = False;
 	}
 
@@ -378,9 +378,9 @@ static BOOL test_lmv2_ntlmv2_broken(enum ntlm_break break_which)
 		   sizeof(user_session_key)) != 0) {
 		DEBUG(1, ("USER (NTLMv2) Session Key does not match expectations!\n"));
  		DEBUG(1, ("user_session_key:\n"));
-		dump_data(1, (const char *)user_session_key, 16);
+		dump_data(1, user_session_key, 16);
  		DEBUG(1, ("expected:\n"));
-		dump_data(1, (const char *)ntlmv2_session_key.data, ntlmv2_session_key.length);
+		dump_data(1, ntlmv2_session_key.data, ntlmv2_session_key.length);
 		pass = False;
 	}
         return pass;