[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3555-gdd13edf

[Jim McDonough]

The branch, v3-2-test has been updated
       via  dd13edf0249718b8deb5db237dd71c9d4c979019 (commit)
       via  1c47bcb5b24ab360d5e632bbf3dcbc7d1d9f6fc4 (commit)
      from  72f55ca71c2d9b4c24866b7e1418fa4c17948db6 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit dd13edf0249718b8deb5db237dd71c9d4c979019
Merge: 1c47bcb5b24ab360d5e632bbf3dcbc7d1d9f6fc4 72f55ca71c2d9b4c24866b7e1418fa4c17948db6
Author: Jim McDonough <jmcd at samba.org>
Date:   Fri Apr 17 09:23:50 2009 +0200

    Merge branch 'v3-2-test' of /home/jmcd/samba/git.samba.org/samba-master into 32-test

commit 1c47bcb5b24ab360d5e632bbf3dcbc7d1d9f6fc4
Author: Jim McDonough <jmcd at samba.org>
Date:   Thu Apr 16 16:42:59 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 041b02a..47377e1 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