[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-5220-g0cc56c3
Jim McDonough
jmcd at samba.org
Fri Apr 17 07:24:57 GMT 2009
The branch, v3-3-test has been updated
via 0cc56c386476c6072f16ad0ae2bb55889b748dc7 (commit)
via bece9b36c455de30eb601912554d43e743def6b2 (commit)
from 8dc31b185d67aa4cdcb367254a913039e3f286ee (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 0cc56c386476c6072f16ad0ae2bb55889b748dc7
Merge: bece9b36c455de30eb601912554d43e743def6b2 8dc31b185d67aa4cdcb367254a913039e3f286ee
Author: Jim McDonough <jmcd at samba.org>
Date: Fri Apr 17 09:24:49 2009 +0200
Merge branch 'v3-3-test' of /home/jmcd/samba/git.samba.org/samba-master into 33-test
commit bece9b36c455de30eb601912554d43e743def6b2
Author: Jim McDonough <jmcd at samba.org>
Date: Thu Apr 16 17:04:00 2009 +0200
Don't look up local user for remote changes, even when root.
-----------------------------------------------------------------------
Summary of changes:
source/utils/smbpasswd.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/utils/smbpasswd.c b/source/utils/smbpasswd.c
index 78c1ce8..6f12692 100644
--- a/source/utils/smbpasswd.c
+++ b/source/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
More information about the samba-cvs
mailing list