Index: rpc_client/cli_samr.c
===================================================================
--- rpc_client/cli_samr.c	(revision 5967)
+++ rpc_client/cli_samr.c	(working copy)
@@ -1429,8 +1429,8 @@
 	SAMR_R_CHGPASSWD_USER r;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 
-	uchar new_nt_password[516];
-	uchar new_lm_password[516];
+	char new_nt_password[516];
+	char new_lm_password[516];
 	uchar old_nt_hash[16];
 	uchar old_lanman_hash[16];
 	uchar old_nt_hash_enc[16];
@@ -1458,7 +1458,7 @@
 
 		encode_pw_buffer(new_lm_password, newpassword, STR_UNICODE);
 
-		SamOEMhash( new_lm_password, old_nt_hash, 516);
+		SamOEMhash( (uchar *)new_lm_password, old_nt_hash, 516);
 		E_old_pw_hash( new_nt_hash, old_lanman_hash, old_lanman_hash_enc);
 	} else {
 		ZERO_STRUCT(new_lm_password);
@@ -1467,7 +1467,7 @@
 
 	encode_pw_buffer(new_nt_password, newpassword, STR_UNICODE);
 	
-	SamOEMhash( new_nt_password, old_nt_hash, 516);
+	SamOEMhash( (uchar *)new_nt_password, old_nt_hash, 516);
 	E_old_pw_hash( new_nt_hash, old_nt_hash, old_nt_hash_enc);
 
 	/* Initialise parse structures */