summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-04-09 00:50:12 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:33 -0500
commit9fda3ecda4b88fa5fbe9ba23a1acc149b9a9a73f (patch)
tree6a3c1ebc83a5b20209b313f50bd7947adbbfb51d
parentdef41233b4ee342313cdcc9417dc5c04d053a18b (diff)
downloadsamba-9fda3ecda4b88fa5fbe9ba23a1acc149b9a9a73f.tar.gz
samba-9fda3ecda4b88fa5fbe9ba23a1acc149b9a9a73f.tar.bz2
samba-9fda3ecda4b88fa5fbe9ba23a1acc149b9a9a73f.zip
r6261: Tidyup message str printf. Ensure tvs struct is zeroed.
Jeremy. (This used to be commit 6c9f227ef400f32def85268f411691b569d29889)
-rw-r--r--source3/smbd/trans2.c1
-rw-r--r--source3/utils/smbpasswd.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 1095e4ce75..1868ce8fe4 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3581,6 +3581,7 @@ static int call_trans2setfilepathinfo(connection_struct *conn, char *inbuf, char
return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
ZERO_STRUCT(sbuf);
+ ZERO_STRUCT(tvs);
if (tran_call == TRANSACT2_SETFILEINFO) {
if (total_params < 4) {
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index 836a161021..708d44df9f 100644
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -290,7 +290,7 @@ static BOOL password_change(const char *remote_mach, char *username,
err_str, sizeof(err_str), msg_str, sizeof(msg_str));
if(*msg_str)
- printf(msg_str);
+ printf("%s", msg_str);
if(*err_str)
fprintf(stderr, "%s", err_str);