diff options
| author | Gerald Carter <jerry@samba.org> | 2005-04-10 22:10:05 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2005-04-10 22:10:05 +0000 |
| commit | 820064592bf3049921220746051d9139fda68c65 (patch) | |
| tree | 32ab62cb2ad369447df340a28364daa73b9f9ec1 /source/utils | |
| parent | 794f35080f5881f01cba7e9232e5620bf431f8a9 (diff) | |
| download | samba-820064592bf3049921220746051d9139fda68c65.tar.gz | |
r6284: Starting on 3.0.14:
svn merge -r6016:6020 ../samba_3_0/
svn merge -r6034:6036 ../samba_3_0/
svn merge -r6060:6062 ../samba_3_0/
svn merge -r6062:6063 ../samba_3_0/
svn merge -r6110:6116 ../samba_3_0/
svn merge -r6152:6154 ../samba_3_0/
svn merge -r6157:6158 ../samba_3_0/
svn merge -r6163:6164 ../samba_3_0/
svn merge -r6167:6169 ../samba_3_0/
svn merge -r6174:6175 ../samba_3_0/
svn merge -r6175:6176 ../samba_3_0/
svn merge -r6204:6216 ../samba_3_0/
svn merge -r6216:6217 ../samba_3_0/
svn merge -r6232:6234 ../samba_3_0/
svn merge -r6234:6235 ../samba_3_0/
svn merge -r6242:6243 ../samba_3_0/
svn merge -r6255:6256 ../samba_3_0/
svn merge -r6279:6281 ../samba_3_0/
TO view the change log from SAMBA_3_0, run:
for rev in 6020 6036 6062 6063 6116 6154 6158 6164 6169 \
6175 6176 6216 6217 6234 6235 6243 6256 6281; do
svn log -r$rev svn://svnanon.samba.org/samba/branches/SAMBA_3_0
done
Diffstat (limited to 'source/utils')
| -rw-r--r-- | source/utils/smbpasswd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/utils/smbpasswd.c b/source/utils/smbpasswd.c index 90c3ce4d2e2..836a161021d 100644 --- a/source/utils/smbpasswd.c +++ b/source/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); } } |