From a2819db2f0a2b09f1d518ba7459dade3d5363de3 Mon Sep 17 00:00:00 2001 From: Herb Lewis Date: Wed, 27 Mar 2002 19:20:48 +0000 Subject: merge from 2.2 - don't check local passdb if -r option used (This used to be commit 15df51e8def01009f2ec1e2d08c3129ac39dabdf) --- source3/utils/smbpasswd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source3/utils') 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; -- cgit