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

[Günther Deschner]

The branch, v3-6-test has been updated
       via  1b58b1e... s3-waf: fix the build.
       via  163cd49... s3-dcerpc: fix some uninitialized variables build warnings.
       via  dcc0314... s3-build: fix some c++ build warnings.
      from  9673c7f... cleanups: Trailing spaces, line length, etc... (cherry picked from commit 28c74564c5bd3c972745deaa904ec8695f21ea1f)

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


- Log -----------------------------------------------------------------
commit 1b58b1ecd0fc920e3433c2f67b3b88be81b226fe
Author: Günther Deschner <gd at samba.org>
Date:   Wed Aug 4 14:55:10 2010 +0200

    s3-waf: fix the build.
    
    Guenther
    (cherry picked from commit 4b17ff4a9088860646e127b17df18d415dbdc97d)

commit 163cd49b09102976036b9425043d921bbcb851f8
Author: Günther Deschner <gd at samba.org>
Date:   Tue Aug 3 15:55:20 2010 +0200

    s3-dcerpc: fix some uninitialized variables build warnings.
    
    Guenther
    (cherry picked from commit 64b26affe0afa2999130cdd4f1d521dccd877c9c)

commit dcc0314f06bd607757ae534f0626f016c521ca90
Author: Günther Deschner <gd at samba.org>
Date:   Sun Aug 1 15:34:52 2010 +0200

    s3-build: fix some c++ build warnings.
    
    Guenther
    (cherry picked from commit 322b52419485b882658c53c21f86e5bdfa82b71f)

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

Summary of changes:
 source3/librpc/rpc/dcerpc_gssapi.c |    4 ++--
 source3/librpc/rpc/dcerpc_spnego.c |    4 ++--
 source3/rpc_client/cli_pipe.c      |    2 +-
 source3/rpc_server/srv_pipe.c      |    2 +-
 source3/wscript_build              |    6 +++++-
 5 files changed, 11 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/librpc/rpc/dcerpc_gssapi.c b/source3/librpc/rpc/dcerpc_gssapi.c
index c9496ab..2de46b5 100644
--- a/source3/librpc/rpc/dcerpc_gssapi.c
+++ b/source3/librpc/rpc/dcerpc_gssapi.c
@@ -310,7 +310,7 @@ static char *gse_errstr(TALLOC_CTX *mem_ctx, OM_uint32 maj, OM_uint32 min)
 		goto done;
 	}
 	gss_maj = gss_display_status(&gss_min, min, GSS_C_MECH_CODE,
-				     discard_const(gss_mech_krb5),
+				     (gss_OID)discard_const(gss_mech_krb5),
 				     &msg_ctx, &msg_min);
 	if (gss_maj) {
 		goto done;
@@ -394,7 +394,7 @@ NTSTATUS gse_seal(TALLOC_CTX *mem_ctx, struct gse_context *gse_ctx,
 	if (!signature->length) {
 		return NT_STATUS_INTERNAL_ERROR;
 	}
-	signature->data = talloc_size(mem_ctx, signature->length);
+	signature->data = (uint8_t *)talloc_size(mem_ctx, signature->length);
 	if (!signature->data) {
 		return NT_STATUS_NO_MEMORY;
 	}
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/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index dcbb816..87575cb 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -2747,7 +2747,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/wscript_build b/source3/wscript_build
index 9d33fd1..1babb54 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -241,6 +241,7 @@ LIBSMB_ERR_SRC = '${LIBSMB_ERR_SRC0} ${LIBSMB_ERR_SRC1} ${REG_PARSE_PRS_SRC}'
 LIBSMB_SRC0 = '''
                ../libcli/auth/ntlm_check.c
                libsmb/ntlmssp.c
+               libsmb/ntlmssp_wrap.c
                ../libcli/auth/ntlmssp.c
                ../libcli/auth/ntlmssp_sign.c
                ${LIBNDR_NTLMSSP_SRC}
@@ -417,7 +418,10 @@ RPC_SERVER_SRC = '''${RPC_PIPE_SRC} ${NPA_TSTREAM_SRC}'''
 
 RPC_PARSE_SRC = '''${RPC_PARSE_SRC2}'''
 
-RPC_CLIENT_SRC = '''rpc_client/cli_pipe.c librpc/rpc/rpc_common.c
+RPC_CLIENT_SRC = '''rpc_client/cli_pipe.c
+                    librpc/rpc/rpc_common.c
+                    librpc/rpc/dcerpc_gssapi.c
+                    librpc/rpc/dcerpc_spnego.c
                     rpc_client/rpc_transport_np.c
 		    rpc_client/rpc_transport_sock.c
 		    rpc_client/rpc_transport_smbd.c'''


-- 
Samba Shared Repository