r6261: Tidyup message str printf. Ensure tvs struct is zeroed.

Jeremy.
(This used to be commit 6c9f227ef400f32def85268f411691b569d29889)

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 1095e4ce75d0c250d62265793706f15255888ed1..1868ce8fe4ae727d9719325b46608c67b53fda38 100644 (file)
--- 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 836a161021d20d43caed3747d7e2a61ed129b516..708d44df9f0937db925da46b10cf1a7c3bc998f8 100644 (file)
--- 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);