From: Jim McDonough <jmcd@samba.org>
Date: Fri, 11 Jul 2003 14:33:03 +0000 (+0000)
Subject: Doesn't re-prompt for password when it is specified on the cmdline
X-Git-Tag: samba-4.0.0alpha6~801^2~13275
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=e1725f0c047209375c7a47638bf3865f532d35f0

Doesn't re-prompt for password when it is specified on the cmdline
(This used to be commit 6ebe87d318658f28ad9b9f8169fc4400856d5812)
---

diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index 2781e630f5e..fac16177528 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) {
+		if (local_flags & LOCAL_ADD_USER & !new_passwd) {
 			/*
 			 * Prompt for trusting domain's account password
 			 */
@@ -465,7 +465,7 @@ static int process_root(int local_flags)
 			}
 		}
 		
-		if(local_flags & LOCAL_SET_PASSWORD) {
+		if(local_flags & LOCAL_SET_PASSWORD & !new_passwd) {
 			new_passwd = prompt_for_new_password(stdin_passwd_get);
 			
 			if(!new_passwd) {