diff options
| author | Volker Lendecke <vlendec@samba.org> | 2003-07-15 16:07:50 +0000 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2003-07-15 16:07:50 +0000 |
| commit | 7a88267a6aec077fb602e5ddf02bead1a024c191 (patch) | |
| tree | 6375673477f9ea4b256e0767f68c5a4b5d8babeb /source3 | |
| parent | ce360c33bec864032141ca6f5c8de018e855891f (diff) | |
| download | samba-7a88267a6aec077fb602e5ddf02bead1a024c191.tar.gz samba-7a88267a6aec077fb602e5ddf02bead1a024c191.tar.bz2 samba-7a88267a6aec077fb602e5ddf02bead1a024c191.zip | |
Jim, could you please look at this? smbpasswd -a <username> was broken
for me without this patch. I'm not sure if I interpreted your patch to
this code right.
Thanks,
Volker
(This used to be commit 46ec022f873416d2258fc8d84430b17319dce70f)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/utils/smbpasswd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c index fac1617752..eade5331af 100644 --- a/source3/utils/smbpasswd.c +++ b/source3/utils/smbpasswd.c @@ -420,7 +420,7 @@ static int process_root(int local_flags) } else if (local_flags & LOCAL_INTERDOM_ACCOUNT) { static fstring buf; - if (local_flags & LOCAL_ADD_USER & !new_passwd) { + if ((local_flags & LOCAL_ADD_USER) && (new_passwd == NULL)) { /* * Prompt for trusting domain's account password */ @@ -465,7 +465,7 @@ static int process_root(int local_flags) } } - if(local_flags & LOCAL_SET_PASSWORD & !new_passwd) { + if((local_flags & LOCAL_SET_PASSWORD) && (new_passwd == NULL)) { new_passwd = prompt_for_new_password(stdin_passwd_get); if(!new_passwd) { |