The branch, v3-4-test has been updated via afc2a0f9c860fbaee86c96e2f77b2f551727c2fd (commit) via 583d7c97bb5f9b62fab17ce2466442ece648331f (commit) from edf797fb614271c17bc005a661af8c8e8b913d81 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log ----------------------------------------------------------------- commit afc2a0f9c860fbaee86c96e2f77b2f551727c2fd Merge: 583d7c97bb5f9b62fab17ce2466442ece648331f edf797fb614271c17bc005a661af8c8e8b913d81 Author: Jim McDonough <j...@samba.org> Date: Fri Apr 17 09:25:06 2009 +0200 Merge branch 'v3-4-test' of /home/jmcd/samba/git.samba.org/samba-master into 34-test commit 583d7c97bb5f9b62fab17ce2466442ece648331f Author: Jim McDonough <j...@samba.org> Date: Thu Apr 16 17:14:20 2009 +0200 Don't look up local user for remote changes, even when root. ----------------------------------------------------------------------- Summary of changes: source3/utils/smbpasswd.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c index 4cd0d55..8cca93f 100644 --- a/source3/utils/smbpasswd.c +++ b/source3/utils/smbpasswd.c @@ -430,14 +430,18 @@ static int process_root(int local_flags) } if((local_flags & LOCAL_SET_PASSWORD) && (new_passwd == NULL)) { - struct passwd *passwd = getpwnam_alloc(NULL, user_name); + struct passwd *passwd; - if (!passwd) { - fprintf(stderr, "Cannot locate Unix account for " - "'%s'!\n", user_name); - exit(1); + if (remote_machine == NULL) { + passwd = getpwnam_alloc(NULL, user_name); + + if (!passwd) { + fprintf(stderr, "Cannot locate Unix account for " + "'%s'!\n", user_name); + exit(1); + } + TALLOC_FREE(passwd); } - TALLOC_FREE(passwd); new_passwd = prompt_for_new_password(stdin_passwd_get); -- Samba Shared Repository