[SCM] Samba Shared Repository - branch master updated - cda0b7051967afaaaafbd3dad2052c66b3035491

[Jeremy Allison]

The branch, master has been updated
       via  cda0b7051967afaaaafbd3dad2052c66b3035491 (commit)
      from  964acde86e17d91148e063ce81014444e4c1f63d (commit)

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


- Log -----------------------------------------------------------------
commit cda0b7051967afaaaafbd3dad2052c66b3035491
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Jan 9 19:40:09 2009 -0800

    Minor tidyup of unix account missing code.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/utils/smbpasswd.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index 93e2f81..4cd0d55 100644
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -430,14 +430,14 @@ static int process_root(int local_flags)
 		}
 
 		if((local_flags & LOCAL_SET_PASSWORD) && (new_passwd == NULL)) {
-			struct passwd *passwd;
+			struct passwd *passwd = getpwnam_alloc(NULL, user_name);
 
-			passwd = getpwnam_alloc(NULL, user_name);
 			if (!passwd) {
-				DEBUG(0, ("Cannot locate Unix account for "
-					  "'%s'!\n", user_name));
-				exit(1);;
+				fprintf(stderr, "Cannot locate Unix account for "
+					  "'%s'!\n", user_name);
+				exit(1);
 			}
+			TALLOC_FREE(passwd);
 
 			new_passwd = prompt_for_new_password(stdin_passwd_get);
 


-- 
Samba Shared Repository