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)

diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index fac161775286a87a9a396d73534c41e9fcb93798..eade5331af658f5d5ddb7333b56a2d0e7c011262 100644 (file)
--- 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) {