From 673ec08b13325cd3e87d8ce7eaef421197bf9c39 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 20 Jan 1999 02:44:50 +0000 Subject: smbd/ipc.c: Fixed potential return without calling va_end(). smbd/password.c: Fixed ACB_DISABLED flag when doing 'update encrypted'. Jeremy. --- source/smbd/ipc.c | 5 ++++- source/smbd/password.c | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/source/smbd/ipc.c b/source/smbd/ipc.c index 12a086c98c7..2b377ec9f74 100644 --- a/source/smbd/ipc.c +++ b/source/smbd/ipc.c @@ -371,7 +371,10 @@ va_dcl #endif stringneeded = -1; - if (!p->curpos) return(0); + if (!p->curpos) { + va_end(args); + return(0); + } switch( *p->curpos++ ) { case 'W': /* word (2 byte) */ diff --git a/source/smbd/password.c b/source/smbd/password.c index 0181188ca24..f42b790e4a5 100644 --- a/source/smbd/password.c +++ b/source/smbd/password.c @@ -322,7 +322,13 @@ static BOOL update_smbpassword_file(char *user, char *password) DEBUG(0,("getsmbpwnam returned NULL\n")); return False; } - + + /* + * Remove the account disabled flag - we are updating the + * users password from a login. + */ + smbpw->acct_ctrl &= ~ACB_DISABLED; + /* Here, the flag is one, because we want to ignore the XXXXXXX'd out password */ ret = change_oem_password( smbpw, password, True); -- cgit v1.2.1