Attachment 1038 Details for Bug 2461 – patches smbd/chgpasswd.c libsmb/smbencrypt.c rpc_server/srv_samr_nt.c

[patch] patches smbd/chgpasswd.c libsmb/smbencrypt.c rpc_server/srv_samr_nt.c

bug2461.patch (text/plain), 2.13 KB, created by Jason Mader (mail bounces back) on 2005-03-16 11:30:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Mader (mail bounces back)

Created: 2005-03-16 11:30:41 UTC

Size: 2.13 KB

patch

obsolete

>--- smbd/chgpasswd.c	Wed Mar 16 13:26:22 2005
>+++ smbd/chgpasswd.c.N	Wed Mar 16 13:25:29 2005
>@@ -747,8 +747,8 @@
> 	static uchar null_pw[16];
> 	static uchar null_ntpw[16];
> 	SAM_ACCOUNT *sampass = NULL;
>-	char *password_encrypted;
>-	const char *encryption_key;
>+	unsigned char *password_encrypted;
>+	const unsigned char *encryption_key;
> 	const uint8 *lanman_pw, *nt_pw;
> 	uint16 acct_ctrl;
> 	uint32 new_pw_len;
>@@ -969,8 +969,8 @@
> 		return True;
> 	}
> 
>-	dump_data(100, new_nt_p16, NT_HASH_LEN);
>-	dump_data(100, pwhistory, PW_HISTORY_ENTRY_LEN*pwHisLen);
>+	dump_data(100, (char*)new_nt_p16, NT_HASH_LEN);
>+	dump_data(100, (char*)pwhistory, PW_HISTORY_ENTRY_LEN*pwHisLen);
> 
> 	memset(zero_md5_nt_pw, '\0', SALTED_MD5_HASH_LEN);
> 	for (i=0; i<pwHisLen; i++) {
>--- libsmb/smbencrypt.c	Fri Feb 25 12:59:33 2005
>+++ libsmb/smbencrypt.c.N	Wed Mar 16 11:34:48 2005
>@@ -513,7 +513,7 @@
>  *new_pw_len is the length in bytes of the possibly mulitbyte
>  returned password including termination.
> ************************************************************/
>-BOOL decode_pw_buffer(char in_buffer[516], char *new_pwrd,
>+BOOL decode_pw_buffer(unsigned char in_buffer[516], char *new_pwrd,
> 		      int new_pwrd_size, uint32 *new_pw_len,
> 		      int string_flags)
> {
>--- rpc_server/srv_samr_nt.c	Fri Mar 11 08:47:04 2005
>+++ rpc_server/srv_samr_nt.c.N	Wed Mar 16 11:35:05 2005
>@@ -2900,7 +2900,7 @@
> 
> 	acct_ctrl = pdb_get_acct_ctrl(pwd);
> 
>-	if (!decode_pw_buffer((char*)id23->pass, plaintext_buf, 256, &len, STR_UNICODE)) {
>+	if (!decode_pw_buffer(id23->pass, plaintext_buf, 256, &len, STR_UNICODE)) {
> 		pdb_free_sam(&pwd);
> 		return False;
>  	}
>@@ -2951,7 +2951,7 @@
>  set_user_info_pw
>  ********************************************************************/
> 
>-static BOOL set_user_info_pw(char *pass, SAM_ACCOUNT *pwd)
>+static BOOL set_user_info_pw(unsigned char *pass, SAM_ACCOUNT *pwd)
> {
> 	uint32 len;
> 	pstring plaintext_buf;
>@@ -3097,7 +3097,7 @@
> 
> 			dump_data(100, (char *)ctr->info.id24->pass, 516);
> 
>-			if (!set_user_info_pw((char *)ctr->info.id24->pass, pwd))
>+			if (!set_user_info_pw(ctr->info.id24->pass, pwd))
> 				r_u->status = NT_STATUS_ACCESS_DENIED;
> 			break;
>

Actions: View

Attachments on bug 2461: 1037 | 1038