r6256: Fix fprintf errors in smbpasswd. Fix for bug #2585 Ulf Härnhammar <metaur...

Jeremy.
(This used to be commit 3dfa6c40fc726ddf38d4cfc6e0604ceed0035d18)

diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index 90c3ce4d2e2ef752e306b73354df1fa8f22005d9..836a161021d20d43caed3747d7e2a61ed129b516 100644 (file)
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -282,7 +282,7 @@ static BOOL password_change(const char *remote_mach, char *username,
                ret = remote_password_change(remote_mach, username, 
                                             old_passwd, new_pw, err_str, sizeof(err_str));
                if(*err_str)
-                       fprintf(stderr, err_str);
+                       fprintf(stderr, "%s", err_str);
                return ret;
        }
        
@@ -292,7 +292,7 @@ static BOOL password_change(const char *remote_mach, char *username,
        if(*msg_str)
                printf(msg_str);
        if(*err_str)
-               fprintf(stderr, err_str);
+               fprintf(stderr, "%s", err_str);
 
        return ret;
 }
@@ -503,7 +503,7 @@ static int process_nonroot(int local_flags)
                        fstrcpy(user_name,pwd->pw_name);
                        passwd_free(&pwd);
                } else {
-                       fprintf(stderr, "smbpasswd: you don't exist - go away\n");
+                       fprintf(stderr, "smbpasswd: cannot lookup user name for uid %u\n", (unsigned int)getuid());
                        exit(1);
                }
        }