[SCM] Samba Shared Repository - branch master updated

Jelmer Vernooij jelmer at samba.org
Sun Mar 25 16:57:04 MDT 2012


The branch, master has been updated
       via  8ad52f6 s3-make: Fix build with new smb2_session file.
       via  d9975a1 LIBCLI_SMB2: Depend on cli_smb_common rather than libsmb.
       via  a8c066b smb2: Move smb2cli session setup code to cli_smb_common.
       via  5283aa5 libcli/smb: Stop generating unused proto file.
      from  3c9b32b replace: Avoid DEBUG(), which is not available in libreplace.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8ad52f63863a677bdec1a543c1ed23e9e9ddfa65
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Mar 25 23:18:52 2012 +0200

    s3-make: Fix build with new smb2_session file.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Mon Mar 26 00:56:13 CEST 2012 on sn-devel-104

commit d9975a13fdd2c4b41414619780c3428ce1d3af3b
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Mar 25 17:15:42 2012 +0200

    LIBCLI_SMB2: Depend on cli_smb_common rather than libsmb.
    
    The latter pulls in a fair number of other libraries, including popt and the Samba registry library.

commit a8c066b0230ebe40c0586973cc1eec1018255708
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Mar 25 17:14:56 2012 +0200

    smb2: Move smb2cli session setup code to cli_smb_common.

commit 5283aa5356382256fc5336a468be414e8e33fc3b
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Mar 25 17:14:14 2012 +0200

    libcli/smb: Stop generating unused proto file.

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

Summary of changes:
 .../smb2cli_session.c => libcli/smb/smb2_session.c |  109 +----------
 libcli/smb/wscript_build                           |    2 +-
 source3/Makefile.in                                |    1 +
 source3/libsmb/smb2cli_session.c                   |  207 --------------------
 source4/libcli/smb2/wscript_build                  |    2 +-
 5 files changed, 6 insertions(+), 315 deletions(-)
 copy source3/libsmb/smb2cli_session.c => libcli/smb/smb2_session.c (71%)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/smb2cli_session.c b/libcli/smb/smb2_session.c
similarity index 71%
copy from source3/libsmb/smb2cli_session.c
copy to libcli/smb/smb2_session.c
index 13412d1..b69f0a2 100644
--- a/source3/libsmb/smb2cli_session.c
+++ b/libcli/smb/smb2_session.c
@@ -18,14 +18,10 @@
 */
 
 #include "includes.h"
-#include "client.h"
-#include "async_smb.h"
-#include "smb2cli.h"
+#include "system/network.h"
+#include "../lib/util/tevent_ntstatus.h"
+#include "../libcli/smb/smb_common.h"
 #include "../libcli/smb/smbXcli_base.h"
-#include "libsmb/proto.h"
-#include "lib/util/tevent_ntstatus.h"
-#include "../libcli/auth/spnego.h"
-#include "../auth/ntlmssp/ntlmssp.h"
 
 struct smb2cli_session_setup_state {
 	struct smbXcli_session *session;
@@ -234,103 +230,4 @@ NTSTATUS smb2cli_session_setup_recv(struct tevent_req *req,
 	return status;
 }
 
-struct smb2cli_logoff_state {
-	struct cli_state *cli;
-	uint8_t fixed[4];
-};
-
-static void smb2cli_logoff_done(struct tevent_req *subreq);
-
-struct tevent_req *smb2cli_logoff_send(TALLOC_CTX *mem_ctx,
-				       struct tevent_context *ev,
-				       struct cli_state *cli)
-{
-	struct tevent_req *req, *subreq;
-	struct smb2cli_logoff_state *state;
-
-	req = tevent_req_create(mem_ctx, &state,
-				struct smb2cli_logoff_state);
-	if (req == NULL) {
-		return NULL;
-	}
-	state->cli = cli;
-	SSVAL(state->fixed, 0, 4);
-
-	subreq = smb2cli_req_send(state, ev,
-				  cli->conn, SMB2_OP_LOGOFF,
-				  0, 0, /* flags */
-				  cli->timeout,
-				  cli->smb2.pid,
-				  0, /* tid */
-				  cli->smb2.session,
-				  state->fixed, sizeof(state->fixed),
-				  NULL, 0);
-	if (tevent_req_nomem(subreq, req)) {
-		return tevent_req_post(req, ev);
-	}
-	tevent_req_set_callback(subreq, smb2cli_logoff_done, req);
-	return req;
-}
-
-static void smb2cli_logoff_done(struct tevent_req *subreq)
-{
-	struct tevent_req *req =
-		tevent_req_callback_data(subreq,
-		struct tevent_req);
-	struct smb2cli_logoff_state *state =
-		tevent_req_data(req,
-		struct smb2cli_logoff_state);
-	NTSTATUS status;
-	struct iovec *iov;
-	static const struct smb2cli_req_expected_response expected[] = {
-	{
-		.status = NT_STATUS_OK,
-		.body_size = 0x04
-	}
-	};
 
-	status = smb2cli_req_recv(subreq, state, &iov,
-				  expected, ARRAY_SIZE(expected));
-	TALLOC_FREE(subreq);
-	TALLOC_FREE(state->cli->smb2.session);
-	if (tevent_req_nterror(req, status)) {
-		return;
-	}
-	tevent_req_done(req);
-}
-
-NTSTATUS smb2cli_logoff_recv(struct tevent_req *req)
-{
-	return tevent_req_simple_recv_ntstatus(req);
-}
-
-NTSTATUS smb2cli_logoff(struct cli_state *cli)
-{
-	TALLOC_CTX *frame = talloc_stackframe();
-	struct event_context *ev;
-	struct tevent_req *req;
-	NTSTATUS status = NT_STATUS_NO_MEMORY;
-
-	if (cli_has_async_calls(cli)) {
-		/*
-		 * Can't use sync call while an async call is in flight
-		 */
-		status = NT_STATUS_INVALID_PARAMETER;
-		goto fail;
-	}
-	ev = event_context_init(frame);
-	if (ev == NULL) {
-		goto fail;
-	}
-	req = smb2cli_logoff_send(frame, ev, cli);
-	if (req == NULL) {
-		goto fail;
-	}
-	if (!tevent_req_poll_ntstatus(req, ev, &status)) {
-		goto fail;
-	}
-	status = smb2cli_logoff_recv(req);
- fail:
-	TALLOC_FREE(frame);
-	return status;
-}
diff --git a/libcli/smb/wscript_build b/libcli/smb/wscript_build
index bc80e2d..7a21d4a 100644
--- a/libcli/smb/wscript_build
+++ b/libcli/smb/wscript_build
@@ -5,11 +5,11 @@ bld.SAMBA_LIBRARY('cli_smb_common',
 	source='''
 		smb_signing.c smb_seal.c
 		smb2_create_blob.c smb2_signing.c
+		smb2_session.c
 		util.c read_smb.c
 		smbXcli_base.c
 		smb1cli_trans.c
 	''',
-	autoproto='smb_common_proto.h',
 	deps='LIBCRYPTO errors gssapi gensec KRB5_WRAP LIBASYNC_REQ',
 	public_deps='talloc samba-util',
 	private_library=True,
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 14a67a5..003b000 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -613,6 +613,7 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
 	     ../libcli/smb/read_smb.o \
 	     ../libcli/smb/smbXcli_base.o \
 	     ../libcli/smb/smb1cli_trans.o \
+	     ../libcli/smb/smb2_session.o \
 	     libsmb/smb2cli_session.o \
 	     libsmb/smb2cli_tcon.o \
 	     libsmb/smb2cli_create.o \
diff --git a/source3/libsmb/smb2cli_session.c b/source3/libsmb/smb2cli_session.c
index 13412d1..0de82f6 100644
--- a/source3/libsmb/smb2cli_session.c
+++ b/source3/libsmb/smb2cli_session.c
@@ -27,213 +27,6 @@
 #include "../libcli/auth/spnego.h"
 #include "../auth/ntlmssp/ntlmssp.h"
 
-struct smb2cli_session_setup_state {
-	struct smbXcli_session *session;
-	uint8_t fixed[24];
-	uint8_t dyn_pad[1];
-	struct iovec *recv_iov;
-	DATA_BLOB out_security_buffer;
-	NTSTATUS status;
-};
-
-static void smb2cli_session_setup_done(struct tevent_req *subreq);
-
-struct tevent_req *smb2cli_session_setup_send(TALLOC_CTX *mem_ctx,
-				struct tevent_context *ev,
-				struct smbXcli_conn *conn,
-				uint32_t timeout_msec,
-				struct smbXcli_session *session,
-				uint8_t in_flags,
-				uint32_t in_capabilities,
-				uint32_t in_channel,
-				uint64_t in_previous_session_id,
-				const DATA_BLOB *in_security_buffer)
-{
-	struct tevent_req *req, *subreq;
-	struct smb2cli_session_setup_state *state;
-	uint8_t *buf;
-	uint8_t *dyn;
-	size_t dyn_len;
-	uint8_t security_mode;
-	uint16_t security_buffer_offset = 0;
-	uint16_t security_buffer_length = 0;
-
-	req = tevent_req_create(mem_ctx, &state,
-				struct smb2cli_session_setup_state);
-	if (req == NULL) {
-		return NULL;
-	}
-
-	if (session == NULL) {
-		tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER_MIX);
-		return tevent_req_post(req, ev);
-	}
-	state->session = session;
-	security_mode = smb2cli_session_security_mode(session);
-
-	if (in_security_buffer) {
-		if (in_security_buffer->length > UINT16_MAX) {
-			tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER_MIX);
-			return tevent_req_post(req, ev);
-		}
-		security_buffer_offset = SMB2_HDR_BODY + 24;
-		security_buffer_length = in_security_buffer->length;
-	}
-
-	buf = state->fixed;
-
-	SSVAL(buf,  0, 25);
-	SCVAL(buf,  2, in_flags);
-	SCVAL(buf,  3, security_mode);
-	SIVAL(buf,  4, in_capabilities);
-	SIVAL(buf,  8, in_channel);
-	SSVAL(buf, 12, security_buffer_offset);
-	SSVAL(buf, 14, security_buffer_length);
-	SBVAL(buf, 16, in_previous_session_id);
-
-	if (security_buffer_length > 0) {
-		dyn = in_security_buffer->data;
-		dyn_len = in_security_buffer->length;
-	} else {
-		dyn = state->dyn_pad;;
-		dyn_len = sizeof(state->dyn_pad);
-	}
-
-	subreq = smb2cli_req_send(state, ev,
-				  conn, SMB2_OP_SESSSETUP,
-				  0, 0, /* flags */
-				  timeout_msec,
-				  0xFEFF,
-				  0, /* tid */
-				  session,
-				  state->fixed, sizeof(state->fixed),
-				  dyn, dyn_len);
-	if (tevent_req_nomem(subreq, req)) {
-		return tevent_req_post(req, ev);
-	}
-	tevent_req_set_callback(subreq, smb2cli_session_setup_done, req);
-	return req;
-}
-
-static void smb2cli_session_setup_done(struct tevent_req *subreq)
-{
-	struct tevent_req *req =
-		tevent_req_callback_data(subreq,
-		struct tevent_req);
-	struct smb2cli_session_setup_state *state =
-		tevent_req_data(req,
-		struct smb2cli_session_setup_state);
-	NTSTATUS status;
-	uint64_t current_session_id;
-	uint64_t session_id;
-	uint16_t session_flags;
-	uint16_t expected_offset = 0;
-	uint16_t security_buffer_offset;
-	uint16_t security_buffer_length;
-	uint8_t *security_buffer_data = NULL;
-	const uint8_t *hdr;
-	const uint8_t *body;
-	static const struct smb2cli_req_expected_response expected[] = {
-	{
-		.status = NT_STATUS_MORE_PROCESSING_REQUIRED,
-		.body_size = 0x09
-	},
-	{
-		.status = NT_STATUS_OK,
-		.body_size = 0x09
-	}
-	};
-
-	status = smb2cli_req_recv(subreq, state, &state->recv_iov,
-				  expected, ARRAY_SIZE(expected));
-	TALLOC_FREE(subreq);
-	if (!NT_STATUS_IS_OK(status) &&
-	    !NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
-		tevent_req_nterror(req, status);
-		return;
-	}
-
-	hdr = (const uint8_t *)state->recv_iov[0].iov_base;
-	body = (const uint8_t *)state->recv_iov[1].iov_base;
-
-	session_id = BVAL(hdr, SMB2_HDR_SESSION_ID);
-	session_flags = SVAL(body, 2);
-
-	security_buffer_offset = SVAL(body, 4);
-	security_buffer_length = SVAL(body, 6);
-
-	if (security_buffer_length > 0) {
-		expected_offset = SMB2_HDR_BODY + 8;
-	}
-	if (security_buffer_offset != 0) {
-		security_buffer_data = (uint8_t *)state->recv_iov[2].iov_base;
-		expected_offset = SMB2_HDR_BODY + 8;
-	}
-
-	if (security_buffer_offset != expected_offset) {
-		tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
-		return;
-	}
-	if (security_buffer_length > state->recv_iov[2].iov_len) {
-		tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
-		return;
-	}
-
-	state->out_security_buffer.data = security_buffer_data;
-	state->out_security_buffer.length = security_buffer_length;
-
-	current_session_id = smb2cli_session_current_id(state->session);
-	if (current_session_id == 0) {
-		/* A new session was requested */
-		current_session_id = session_id;
-	}
-
-	if (current_session_id != session_id) {
-		tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
-		return;
-	}
-
-	smb2cli_session_set_id_and_flags(state->session,
-					 session_id, session_flags);
-
-	state->status = status;
-	tevent_req_done(req);
-}
-
-NTSTATUS smb2cli_session_setup_recv(struct tevent_req *req,
-				    TALLOC_CTX *mem_ctx,
-				    struct iovec **recv_iov,
-				    DATA_BLOB *out_security_buffer)
-{
-	struct smb2cli_session_setup_state *state =
-		tevent_req_data(req,
-		struct smb2cli_session_setup_state);
-	NTSTATUS status;
-	struct iovec *_tmp;
-
-	if (tevent_req_is_nterror(req, &status)) {
-		tevent_req_received(req);
-		return status;
-	}
-
-	if (recv_iov == NULL) {
-		recv_iov = &_tmp;
-	}
-
-	*recv_iov = talloc_move(mem_ctx, &state->recv_iov);
-
-	*out_security_buffer = state->out_security_buffer;
-
-	/*
-	 * Return the status from the server:
-	 * NT_STATUS_MORE_PROCESSING_REQUIRED or
-	 * NT_STATUS_OK.
-	 */
-	status = state->status;
-	tevent_req_received(req);
-	return status;
-}
-
 struct smb2cli_logoff_state {
 	struct cli_state *cli;
 	uint8_t fixed[4];
diff --git a/source4/libcli/smb2/wscript_build b/source4/libcli/smb2/wscript_build
index 2af1a02..4ade978 100644
--- a/source4/libcli/smb2/wscript_build
+++ b/source4/libcli/smb2/wscript_build
@@ -3,7 +3,7 @@
 bld.SAMBA_SUBSYSTEM('LIBCLI_SMB2',
 	source='transport.c request.c session.c tcon.c create.c close.c connect.c getinfo.c write.c read.c setinfo.c find.c ioctl.c logoff.c tdis.c flush.c lock.c notify.c cancel.c keepalive.c break.c util.c signing.c lease_break.c',
 	autoproto='smb2_proto.h',
-	deps='tevent-util libsmb',
+	deps='tevent-util cli_smb_common',
 	public_deps='smbclient-raw LIBPACKET gensec tevent',
 	public_headers='smb2.h',
 	)


-- 
Samba Shared Repository


More information about the samba-cvs mailing list