summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorHerb Lewis <herb@samba.org>2002-03-27 19:20:48 +0000
committerHerb Lewis <herb@samba.org>2002-03-27 19:20:48 +0000
commita2819db2f0a2b09f1d518ba7459dade3d5363de3 (patch)
tree328c83854dfeaded79f58a80dd49b6e36b41db52 /source3
parentc6cd39d4f706ac1b081c998064263c2728dbc765 (diff)
downloadsamba-a2819db2f0a2b09f1d518ba7459dade3d5363de3.tar.gz
samba-a2819db2f0a2b09f1d518ba7459dade3d5363de3.tar.bz2
samba-a2819db2f0a2b09f1d518ba7459dade3d5363de3.zip
merge from 2.2 - don't check local passdb if -r option used
(This used to be commit 15df51e8def01009f2ec1e2d08c3129ac39dabdf)
Diffstat (limited to 'source3')
-rw-r--r--source3/utils/smbpasswd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index 1262919151..de7e66a084 100644
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -442,7 +442,9 @@ static int process_root(int argc, char *argv[])
goto done;
}
- if(!(local_flags & (LOCAL_ADD_USER|LOCAL_DISABLE_USER|LOCAL_ENABLE_USER|LOCAL_DELETE_USER|LOCAL_SET_NO_PASSWORD|LOCAL_SET_PASSWORD))) {
+ if(remote_machine) {
+ printf("Password changed for user %s on %s.\n", user_name, remote_machine );
+ } else if(!(local_flags & (LOCAL_ADD_USER|LOCAL_DISABLE_USER|LOCAL_ENABLE_USER|LOCAL_DELETE_USER|LOCAL_SET_NO_PASSWORD|LOCAL_SET_PASSWORD))) {
SAM_ACCOUNT *sampass = NULL;
BOOL ret;