sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

s3:smbd: remove pointless static variables in chgpasswd.c

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2009-01-08 08:47:57 +01:00
parent 33dd8e850b
commit 2f9f8fe81e
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source3/smbd/chgpasswd.c
View File

@ -712,7 +712,7 @@ bool check_lanman_password(char *user, uchar * pass1,
bool change_lanman_password(struct samu *sampass, uchar *pass2) bool change_lanman_password(struct samu *sampass, uchar *pass2)
{ {
static uchar null_pw[16]; uchar null_pw[16];
uchar unenc_new_pw[16]; uchar unenc_new_pw[16];
bool ret; bool ret;
uint32 acct_ctrl; uint32 acct_ctrl;
@ -735,20 +735,21 @@ bool change_lanman_password(struct samu *sampass, uchar *pass2)
if (pwd == NULL) { if (pwd == NULL) {
if (acct_ctrl & ACB_PWNOTREQ) { if (acct_ctrl & ACB_PWNOTREQ) {
uchar no_pw[14]; uchar no_pw[14];
memset(no_pw, '\0', 14);
ZERO_STRUCT(no_pw);
E_P16(no_pw, null_pw); E_P16(no_pw, null_pw);
/* Get the new lanman hash. */ pwd = null_pw;
D_P16(null_pw, pass2, unenc_new_pw);
} else { } else {
DEBUG(0,("change_lanman_password: no lanman password !\n")); DEBUG(0,("change_lanman_password: no lanman password !\n"));
return False; return False;
} }
} else {
/* Get the new lanman hash. */
D_P16(pwd, pass2, unenc_new_pw);
} }
/* Get the new lanman hash. */
D_P16(pwd, pass2, unenc_new_pw);
if (!pdb_set_lanman_passwd(sampass, unenc_new_pw, PDB_CHANGED)) { if (!pdb_set_lanman_passwd(sampass, unenc_new_pw, PDB_CHANGED)) {
return False; return False;
} }
@ -826,8 +827,8 @@ static NTSTATUS check_oem_password(const char *user,
struct samu **hnd, struct samu **hnd,
char **pp_new_passwd) char **pp_new_passwd)
{ {
static uchar null_pw[16]; uchar null_pw[16];
static uchar null_ntpw[16]; uchar null_ntpw[16];
struct samu *sampass = NULL; struct samu *sampass = NULL;
uint8 *password_encrypted; uint8 *password_encrypted;
const uint8 *encryption_key; const uint8 *encryption_key;