The branch, master has been updated
via 64b26af... s3-dcerpc: fix some uninitialized variables build
warnings.
via bf19a52... s3-spoolss: fix type-punned pointer build warning.
via 743a2de... s3-spoolss: fix uninitialized variable build warning.
via c530aa3... s3-printing: make sure to set NTSTATUS code before
checking it.
from bf5d88e... s4/vampire: update dNSHostName for the Server object
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 64b26affe0afa2999130cdd4f1d521dccd877c9c
Author: Günther Deschner <[email protected]>
Date: Tue Aug 3 15:55:20 2010 +0200
s3-dcerpc: fix some uninitialized variables build warnings.
Guenther
commit bf19a5228aa582e35d1447cb918a1f66bfdf8b2d
Author: Günther Deschner <[email protected]>
Date: Tue Aug 3 15:13:57 2010 +0200
s3-spoolss: fix type-punned pointer build warning.
Guenther
commit 743a2dedf42c2aa3e9e6caee92e3e9581ae56dce
Author: Günther Deschner <[email protected]>
Date: Tue Aug 3 14:51:27 2010 +0200
s3-spoolss: fix uninitialized variable build warning.
Andreas, please check.
Guenther
commit c530aa33cd9ac75bdd79754a2886bff54115800a
Author: Günther Deschner <[email protected]>
Date: Tue Aug 3 13:18:01 2010 +0200
s3-printing: make sure to set NTSTATUS code before checking it.
Andreas, please check.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/librpc/rpc/dcerpc_spnego.c | 4 ++--
source3/printing/nt_printing_migrate.c | 10 +++++-----
source3/rpc_client/cli_pipe.c | 2 +-
source3/rpc_server/srv_pipe.c | 2 +-
source3/rpc_server/srv_spoolss_nt.c | 2 +-
source3/rpc_server/srv_spoolss_util.c | 4 +++-
6 files changed, 13 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/librpc/rpc/dcerpc_spnego.c
b/source3/librpc/rpc/dcerpc_spnego.c
index a0832ce..5627a0d 100644
--- a/source3/librpc/rpc/dcerpc_spnego.c
+++ b/source3/librpc/rpc/dcerpc_spnego.c
@@ -68,7 +68,7 @@ NTSTATUS spnego_gssapi_init_client(TALLOC_CTX *mem_ctx,
uint32_t add_gss_c_flags,
struct spnego_context **spnego_ctx)
{
- struct spnego_context *sp_ctx;
+ struct spnego_context *sp_ctx = NULL;
NTSTATUS status;
status = spnego_context_init(mem_ctx,
@@ -97,7 +97,7 @@ NTSTATUS spnego_ntlmssp_init_client(TALLOC_CTX *mem_ctx,
const char *password,
struct spnego_context **spnego_ctx)
{
- struct spnego_context *sp_ctx;
+ struct spnego_context *sp_ctx = NULL;
NTSTATUS status;
status = spnego_context_init(mem_ctx,
diff --git a/source3/printing/nt_printing_migrate.c
b/source3/printing/nt_printing_migrate.c
index 624d245..1ee5578 100644
--- a/source3/printing/nt_printing_migrate.c
+++ b/source3/printing/nt_printing_migrate.c
@@ -536,11 +536,11 @@ static NTSTATUS migrate_internal(TALLOC_CTX *mem_ctx,
}
if (strncmp((const char *) kbuf.dptr, PRINTERS_PREFIX,
strlen(PRINTERS_PREFIX)) == 0) {
- migrate_printer(mem_ctx,
- pipe_hnd,
- (const char *) kbuf.dptr +
strlen(PRINTERS_PREFIX),
- dbuf.dptr,
- dbuf.dsize);
+ status = migrate_printer(mem_ctx,
+ pipe_hnd,
+ (const char *) kbuf.dptr +
strlen(PRINTERS_PREFIX),
+ dbuf.dptr,
+ dbuf.dsize);
SAFE_FREE(dbuf.dptr);
if (!NT_STATUS_IS_OK(status)) {
tdb_close(tdb);
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 2bb9aad..b38000e 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -2746,7 +2746,7 @@ NTSTATUS cli_rpc_pipe_open_ntlmssp(struct cli_state *cli,
struct rpc_pipe_client **presult)
{
struct rpc_pipe_client *result;
- struct pipe_auth_data *auth;
+ struct pipe_auth_data *auth = NULL;
enum dcerpc_AuthType auth_type = DCERPC_AUTH_TYPE_NTLMSSP;
NTSTATUS status;
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index 899073b..436e5be 100644
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -205,7 +205,7 @@ static NTSTATUS create_next_packet(TALLOC_CTX *mem_ctx,
bool create_next_pdu(struct pipes_struct *p)
{
- size_t pdu_size;
+ size_t pdu_size = 0;
NTSTATUS status;
/*
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index b62a7c0..d0473ed 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -447,7 +447,7 @@ static bool set_printer_hnd_name(TALLOC_CTX *mem_ctx,
int n_services=lp_numservices();
char *aprinter;
const char *printername;
- const char *servername;
+ const char *servername = NULL;
fstring sname;
bool found = false;
struct spoolss_PrinterInfo2 *info2 = NULL;
diff --git a/source3/rpc_server/srv_spoolss_util.c
b/source3/rpc_server/srv_spoolss_util.c
index 3a9523c..5b47154 100644
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -4045,13 +4045,15 @@ WERROR winreg_get_driver(TALLOC_CTX *mem_ctx,
for (i = 0; i < num_values; i++) {
const char *tmp_str;
+ uint32_t tmp = 0;
v = &enum_values[i];
result = winreg_enumval_to_dword(info8, v,
"Version",
- (uint32_t *) &info8->version);
+ &tmp);
CHECK_ERROR(result);
+ info8->version = tmp;
result = winreg_enumval_to_sz(info8, v,
"Driver",
--
Samba Shared Repository
