summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJim McDonough <jmcd@samba.org>2003-07-11 14:33:03 +0000
committerJim McDonough <jmcd@samba.org>2003-07-11 14:33:03 +0000
commite1725f0c047209375c7a47638bf3865f532d35f0 (patch)
tree376318c8c3bedf24195570a6031a0578d6adf3b1 /source3
parent5cd3b7c71c499aedaa712b62dc2a612e9cc4f4d0 (diff)
downloadsamba-e1725f0c047209375c7a47638bf3865f532d35f0.tar.gz
samba-e1725f0c047209375c7a47638bf3865f532d35f0.tar.bz2
samba-e1725f0c047209375c7a47638bf3865f532d35f0.zip
Doesn't re-prompt for password when it is specified on the cmdline
(This used to be commit 6ebe87d318658f28ad9b9f8169fc4400856d5812)
Diffstat (limited to 'source3')
-rw-r--r--source3/utils/smbpasswd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index 2781e630f5..fac1617752 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) {