[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  d49f509 s3:smb2cli: remove unused struct ntlmssp_state from smb2cli_session_setup_state
       via  d02e7f7 s3:smb2cli: s/smb2cli_sesssetup_blob/smb2cli_session_setup/
      from  9d98461 s4-dsdb: cope with out of sync replication attributes in partition module

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


- Log -----------------------------------------------------------------
commit d49f509ec606175fedf41126a3d58c9681932f09
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sun Sep 18 20:24:38 2011 +0200

    s3:smb2cli: remove unused struct ntlmssp_state from smb2cli_session_setup_state
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Mon Sep 19 06:06:46 CEST 2011 on sn-devel-104

commit d02e7f725eddca09dc0f8c788acf5af70f12a225
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sun Sep 18 20:23:22 2011 +0200

    s3:smb2cli: s/smb2cli_sesssetup_blob/smb2cli_session_setup/
    
    metze

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

Summary of changes:
 source3/libsmb/smb2cli_session.c |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/smb2cli_session.c b/source3/libsmb/smb2cli_session.c
index 1ba63b0..58204be 100644
--- a/source3/libsmb/smb2cli_session.c
+++ b/source3/libsmb/smb2cli_session.c
@@ -27,29 +27,28 @@
 #include "../libcli/auth/spnego.h"
 #include "../libcli/auth/ntlmssp.h"
 
-struct smb2cli_sesssetup_blob_state {
-	struct ntlmssp_state *ntlmssp;
+struct smb2cli_session_setup_state {
 	uint8_t fixed[24];
 	uint8_t dyn_pad[1];
 	uint64_t uid;
 	DATA_BLOB out;
 };
 
-static void smb2cli_sesssetup_blob_done(struct tevent_req *subreq);
+static void smb2cli_session_setup_done(struct tevent_req *subreq);
 
-static struct tevent_req *smb2cli_sesssetup_blob_send(TALLOC_CTX *mem_ctx,
+static struct tevent_req *smb2cli_session_setup_send(TALLOC_CTX *mem_ctx,
 						struct tevent_context *ev,
 						struct cli_state *cli,
 						DATA_BLOB *blob)
 {
 	struct tevent_req *req, *subreq;
-	struct smb2cli_sesssetup_blob_state *state;
+	struct smb2cli_session_setup_state *state;
 	uint8_t *buf;
 	uint8_t *dyn;
 	size_t dyn_len;
 
 	req = tevent_req_create(mem_ctx, &state,
-				struct smb2cli_sesssetup_blob_state);
+				struct smb2cli_session_setup_state);
 	if (req == NULL) {
 		return NULL;
 	}
@@ -84,18 +83,18 @@ static struct tevent_req *smb2cli_sesssetup_blob_send(TALLOC_CTX *mem_ctx,
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
 	}
-	tevent_req_set_callback(subreq, smb2cli_sesssetup_blob_done, req);
+	tevent_req_set_callback(subreq, smb2cli_session_setup_done, req);
 	return req;
 }
 
-static void smb2cli_sesssetup_blob_done(struct tevent_req *subreq)
+static void smb2cli_session_setup_done(struct tevent_req *subreq)
 {
 	struct tevent_req *req =
 		tevent_req_callback_data(subreq,
 		struct tevent_req);
-	struct smb2cli_sesssetup_blob_state *state =
+	struct smb2cli_session_setup_state *state =
 		tevent_req_data(req,
-		struct smb2cli_sesssetup_blob_state);
+		struct smb2cli_session_setup_state);
 	NTSTATUS status;
 	struct iovec *iov;
 	uint16_t offset, length;
@@ -137,12 +136,12 @@ static void smb2cli_sesssetup_blob_done(struct tevent_req *subreq)
 	tevent_req_done(req);
 }
 
-static NTSTATUS smb2cli_sesssetup_blob_recv(struct tevent_req *req,
+static NTSTATUS smb2cli_session_setup_recv(struct tevent_req *req,
 					    uint64_t *uid, DATA_BLOB *out)
 {
-	struct smb2cli_sesssetup_blob_state *state =
+	struct smb2cli_session_setup_state *state =
 		tevent_req_data(req,
-		struct smb2cli_sesssetup_blob_state);
+		struct smb2cli_session_setup_state);
 	NTSTATUS status = NT_STATUS_OK;
 
 	if (tevent_req_is_nterror(req, &status)
@@ -219,7 +218,7 @@ struct tevent_req *smb2cli_sesssetup_ntlmssp_send(TALLOC_CTX *mem_ctx,
 	blob_out = spnego_gen_negTokenInit(state, OIDs_ntlm, &blob_out, NULL);
 	state->turn = 1;
 
-	subreq = smb2cli_sesssetup_blob_send(
+	subreq = smb2cli_session_setup_send(
 		state, state->ev, state->cli, &blob_out);
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
@@ -244,7 +243,7 @@ static void smb2cli_sesssetup_ntlmssp_done(struct tevent_req *subreq)
 	DATA_BLOB blob, blob_in, blob_out, spnego_blob;
 	bool ret;
 
-	status = smb2cli_sesssetup_blob_recv(subreq, &uid, &blob);
+	status = smb2cli_session_setup_recv(subreq, &uid, &blob);
 	if (!NT_STATUS_IS_OK(status)
 	    && !NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
 		TALLOC_FREE(subreq);
@@ -289,7 +288,7 @@ static void smb2cli_sesssetup_ntlmssp_done(struct tevent_req *subreq)
 		return;
 	}
 
-	subreq = smb2cli_sesssetup_blob_send(
+	subreq = smb2cli_session_setup_send(
 		state, state->ev, state->cli, &spnego_blob);
 	if (tevent_req_nomem(subreq, req)) {
 		return;


-- 
Samba Shared Repository