[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1067-g1214bf6

[Jim McDonough]

The branch, master has been updated
       via  1214bf606d1cdf3f33b91ffe7cb4c349ce737d68 (commit)
       via  75ccf934ac09e5af68cfd5afdd75a1b32ca24287 (commit)
      from  05ea8daacabe62b6c20770a8518192c44e7eb763 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1214bf606d1cdf3f33b91ffe7cb4c349ce737d68
Merge: 75ccf934ac09e5af68cfd5afdd75a1b32ca24287 05ea8daacabe62b6c20770a8518192c44e7eb763
Author: Jim McDonough <jmcd at samba.org>
Date:   Fri Apr 17 09:28:01 2009 +0200

    Merge branch 'master' of /home/jmcd/samba/git.samba.org/samba-master into mymaster

commit 75ccf934ac09e5af68cfd5afdd75a1b32ca24287
Author: Jim McDonough <jmcd at samba.org>
Date:   Thu Apr 16 17:14:29 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