diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-01-08 08:47:57 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-01-08 12:22:18 +0100 |
| commit | 2f9f8fe81e56f9c7bb15e96f9154afe73cf96f1a (patch) | |
| tree | d4d652b20f391a0aef6abaea1e2f8fa0485abd2b | |
| parent | 33dd8e850b98deaaada160a811aa6f78a4a012b8 (diff) | |
| download | samba-2f9f8fe81e56f9c7bb15e96f9154afe73cf96f1a.tar.gz samba-2f9f8fe81e56f9c7bb15e96f9154afe73cf96f1a.tar.bz2 samba-2f9f8fe81e56f9c7bb15e96f9154afe73cf96f1a.zip | |
s3:smbd: remove pointless static variables in chgpasswd.c
metze
| -rw-r--r-- | source3/smbd/chgpasswd.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c index e6d2bbf59f..78bace7e92 100644 --- a/source3/smbd/chgpasswd.c +++ b/source3/smbd/chgpasswd.c @@ -712,7 +712,7 @@ bool check_lanman_password(char *user, uchar * pass1, bool change_lanman_password(struct samu *sampass, uchar *pass2) { - static uchar null_pw[16]; + uchar null_pw[16]; uchar unenc_new_pw[16]; bool ret; uint32 acct_ctrl; @@ -735,20 +735,21 @@ bool change_lanman_password(struct samu *sampass, uchar *pass2) if (pwd == NULL) { if (acct_ctrl & ACB_PWNOTREQ) { uchar no_pw[14]; - memset(no_pw, '\0', 14); + + ZERO_STRUCT(no_pw); + E_P16(no_pw, null_pw); - /* Get the new lanman hash. */ - D_P16(null_pw, pass2, unenc_new_pw); + pwd = null_pw; } else { DEBUG(0,("change_lanman_password: no lanman password !\n")); 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)) { return False; } @@ -826,8 +827,8 @@ static NTSTATUS check_oem_password(const char *user, struct samu **hnd, char **pp_new_passwd) { - static uchar null_pw[16]; - static uchar null_ntpw[16]; + uchar null_pw[16]; + uchar null_ntpw[16]; struct samu *sampass = NULL; uint8 *password_encrypted; const uint8 *encryption_key; |