[SCM] Samba Shared Repository - branch v3-6-test updated

[Günther Deschner]

The branch, v3-6-test has been updated
       via  1007dd3 s3-torture: fix uninitialized status code.
       via  0e0cdc1 s3-rpc_client: fix dcerpc_try_samr_connects().
       via  1324924 s3-rpc_client: no need to include gen_ndr/cli_samr.h anymore.
       via  30be636 s3-rpc_client: fix uninitialized variable found by -O3.
      from  d4fa4fc s3-waf: remove RPCCLI_SPOOLSS subsystem.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 1007dd323bb701dc4cfa07d9cfd8a8361cceeccc
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jan 21 15:35:11 2011 +0100

    s3-torture: fix uninitialized status code.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Fri Jan 21 16:52:34 CET 2011 on sn-devel-104
    (cherry picked from commit 6ee39a2f42e83768f99e742f76dd4a1b785fcdae)

commit 0e0cdc162aa5d8fb331ca5054c7e3ffcd919fe31
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jan 21 16:02:18 2011 +0100

    s3-rpc_client: fix dcerpc_try_samr_connects().
    
    Only return when both results are ok.
    
    Guenther
    (cherry picked from commit 6923cc801669ad31741a9e2a024e0d35f1a16d58)

commit 1324924d54a354cd5e564c8ff81560a6b17e661c
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jan 21 16:00:31 2011 +0100

    s3-rpc_client: no need to include gen_ndr/cli_samr.h anymore.
    
    Guenther
    (cherry picked from commit e873ce9b651b665b1b0e3755b016587f02a9f99d)

commit 30be636a97838b80b078c41e10fcef96321afbda
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jan 21 15:51:05 2011 +0100

    s3-rpc_client: fix uninitialized variable found by -O3.
    
    Guenther
    (cherry picked from commit 1f26b101ed594ed55f9679fe595ddba2ef1ecee0)

-----------------------------------------------------------------------

Summary of changes:
 source3/rpc_client/cli_pipe.c |    2 +-
 source3/rpc_client/cli_samr.c |    6 +++---
 source3/torture/torture.c     |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index d7320c1..f353958 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -1688,7 +1688,7 @@ static void rpc_pipe_bind_step_one_done(struct tevent_req *subreq)
 	struct auth_ntlmssp_state *ntlmssp_ctx;
 	struct spnego_context *spnego_ctx;
 	struct gse_context *gse_ctx;
-	struct ncacn_packet *pkt;
+	struct ncacn_packet *pkt = NULL;
 	struct dcerpc_auth auth;
 	DATA_BLOB auth_token = data_blob_null;
 	NTSTATUS status;
diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index 2716a74..19dd255 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "../libcli/auth/libcli_auth.h"
-#include "../librpc/gen_ndr/cli_samr.h"
+#include "../librpc/gen_ndr/ndr_samr_c.h"
 #include "rpc_client/cli_samr.h"
 #include "../lib/crypto/arcfour.h"
 #include "rpc_client/init_lsa.h"
@@ -445,7 +445,7 @@ NTSTATUS dcerpc_try_samr_connects(struct dcerpc_binding_handle *h,
 				      &info_out,
 				      connect_pol,
 				      presult);
-	if (NT_STATUS_IS_OK(status)) {
+	if (NT_STATUS_IS_OK(status) && NT_STATUS_IS_OK(*presult)) {
 		return status;
 	}
 
@@ -456,7 +456,7 @@ NTSTATUS dcerpc_try_samr_connects(struct dcerpc_binding_handle *h,
 				      access_mask,
 				      connect_pol,
 				      presult);
-	if (NT_STATUS_IS_OK(status)) {
+	if (NT_STATUS_IS_OK(status) && NT_STATUS_IS_OK(*presult)) {
 		return status;
 	}
 
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 9822923..df55940 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -667,7 +667,7 @@ static bool rw_torture3(struct cli_state *c, char *lockfname)
 	unsigned countprev = 0;
 	ssize_t sent = 0;
 	bool correct = True;
-	NTSTATUS status;
+	NTSTATUS status = NT_STATUS_OK;
 
 	srandom(1);
 	for (i = 0; i < sizeof(buf); i += sizeof(uint32))


-- 
Samba Shared Repository