[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  e3e7869 s3:smb2cli: s/smb2cli_sesssetup/smb2cli_sesssetup_ntlmssp/
      from  31c1c49 s3: Fix a c++ warning

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


- Log -----------------------------------------------------------------
commit e3e7869f6118126f4a7e608711ca4018e272835b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sun Sep 18 20:09:48 2011 +0200

    s3:smb2cli: s/smb2cli_sesssetup/smb2cli_sesssetup_ntlmssp/
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Sun Sep 18 21:43:26 CEST 2011 on sn-devel-104

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

Summary of changes:
 source3/libsmb/smb2cli.h         |    6 +++---
 source3/libsmb/smb2cli_session.c |   28 ++++++++++++++--------------
 source3/torture/test_smb2.c      |    2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/smb2cli.h b/source3/libsmb/smb2cli.h
index 5db481f..faf7367 100644
--- a/source3/libsmb/smb2cli.h
+++ b/source3/libsmb/smb2cli.h
@@ -26,14 +26,14 @@ struct tevent_req *smb2cli_negprot_send(TALLOC_CTX *mem_ctx,
 NTSTATUS smb2cli_negprot_recv(struct tevent_req *req);
 NTSTATUS smb2cli_negprot(struct cli_state *cli);
 
-struct tevent_req *smb2cli_sesssetup_send(TALLOC_CTX *mem_ctx,
+struct tevent_req *smb2cli_sesssetup_ntlmssp_send(TALLOC_CTX *mem_ctx,
 					  struct tevent_context *ev,
 					  struct cli_state *cli,
 					  const char *user,
 					  const char *domain,
 					  const char *pass);
-NTSTATUS smb2cli_sesssetup_recv(struct tevent_req *req);
-NTSTATUS smb2cli_sesssetup(struct cli_state *cli, const char *user,
+NTSTATUS smb2cli_sesssetup_ntlmssp_recv(struct tevent_req *req);
+NTSTATUS smb2cli_sesssetup_ntlmssp(struct cli_state *cli, const char *user,
 			   const char *domain, const char *pass);
 
 struct tevent_req *smb2cli_logoff_send(TALLOC_CTX *mem_ctx,
diff --git a/source3/libsmb/smb2cli_session.c b/source3/libsmb/smb2cli_session.c
index 28b8f91..1ba63b0 100644
--- a/source3/libsmb/smb2cli_session.c
+++ b/source3/libsmb/smb2cli_session.c
@@ -154,7 +154,7 @@ static NTSTATUS smb2cli_sesssetup_blob_recv(struct tevent_req *req,
 	return status;
 }
 
-struct smb2cli_sesssetup_state {
+struct smb2cli_sesssetup_ntlmssp_state {
 	struct tevent_context *ev;
 	struct cli_state *cli;
 	struct ntlmssp_state *ntlmssp;
@@ -164,9 +164,9 @@ struct smb2cli_sesssetup_state {
 	int turn;
 };
 
-static void smb2cli_sesssetup_done(struct tevent_req *subreq);
+static void smb2cli_sesssetup_ntlmssp_done(struct tevent_req *subreq);
 
-struct tevent_req *smb2cli_sesssetup_send(TALLOC_CTX *mem_ctx,
+struct tevent_req *smb2cli_sesssetup_ntlmssp_send(TALLOC_CTX *mem_ctx,
 					  struct tevent_context *ev,
 					  struct cli_state *cli,
 					  const char *user,
@@ -174,13 +174,13 @@ struct tevent_req *smb2cli_sesssetup_send(TALLOC_CTX *mem_ctx,
 					  const char *pass)
 {
 	struct tevent_req *req, *subreq;
-	struct smb2cli_sesssetup_state *state;
+	struct smb2cli_sesssetup_ntlmssp_state *state;
 	NTSTATUS status;
 	DATA_BLOB blob_out;
 	const char *OIDs_ntlm[] = {OID_NTLMSSP, NULL};
 
 	req = tevent_req_create(mem_ctx, &state,
-				struct smb2cli_sesssetup_state);
+				struct smb2cli_sesssetup_ntlmssp_state);
 	if (req == NULL) {
 		return NULL;
 	}
@@ -224,21 +224,21 @@ struct tevent_req *smb2cli_sesssetup_send(TALLOC_CTX *mem_ctx,
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
 	}
-	tevent_req_set_callback(subreq, smb2cli_sesssetup_done, req);
+	tevent_req_set_callback(subreq, smb2cli_sesssetup_ntlmssp_done, req);
 	return req;
 post_status:
 	tevent_req_nterror(req, status);
 	return tevent_req_post(req, ev);
 }
 
-static void smb2cli_sesssetup_done(struct tevent_req *subreq)
+static void smb2cli_sesssetup_ntlmssp_done(struct tevent_req *subreq)
 {
 	struct tevent_req *req =
 		tevent_req_callback_data(subreq,
 		struct tevent_req);
-	struct smb2cli_sesssetup_state *state =
+	struct smb2cli_sesssetup_ntlmssp_state *state =
 		tevent_req_data(req,
-		struct smb2cli_sesssetup_state);
+		struct smb2cli_sesssetup_ntlmssp_state);
 	NTSTATUS status;
 	uint64_t uid = 0;
 	DATA_BLOB blob, blob_in, blob_out, spnego_blob;
@@ -294,15 +294,15 @@ static void smb2cli_sesssetup_done(struct tevent_req *subreq)
 	if (tevent_req_nomem(subreq, req)) {
 		return;
 	}
-	tevent_req_set_callback(subreq, smb2cli_sesssetup_done, req);
+	tevent_req_set_callback(subreq, smb2cli_sesssetup_ntlmssp_done, req);
 }
 
-NTSTATUS smb2cli_sesssetup_recv(struct tevent_req *req)
+NTSTATUS smb2cli_sesssetup_ntlmssp_recv(struct tevent_req *req)
 {
 	return tevent_req_simple_recv_ntstatus(req);
 }
 
-NTSTATUS smb2cli_sesssetup(struct cli_state *cli, const char *user,
+NTSTATUS smb2cli_sesssetup_ntlmssp(struct cli_state *cli, const char *user,
 			   const char *domain, const char *pass)
 {
 	TALLOC_CTX *frame = talloc_stackframe();
@@ -321,14 +321,14 @@ NTSTATUS smb2cli_sesssetup(struct cli_state *cli, const char *user,
 	if (ev == NULL) {
 		goto fail;
 	}
-	req = smb2cli_sesssetup_send(frame, ev, cli, user, domain, pass);
+	req = smb2cli_sesssetup_ntlmssp_send(frame, ev, cli, user, domain, pass);
 	if (req == NULL) {
 		goto fail;
 	}
 	if (!tevent_req_poll_ntstatus(req, ev, &status)) {
 		goto fail;
 	}
-	status = smb2cli_sesssetup_recv(req);
+	status = smb2cli_sesssetup_ntlmssp_recv(req);
  fail:
 	TALLOC_FREE(frame);
 	return status;
diff --git a/source3/torture/test_smb2.c b/source3/torture/test_smb2.c
index 5d3bc76..c66d1df 100644
--- a/source3/torture/test_smb2.c
+++ b/source3/torture/test_smb2.c
@@ -49,7 +49,7 @@ bool run_smb2_basic(int dummy)
 		return false;
 	}
 
-	status = smb2cli_sesssetup(cli, username, workgroup, password);
+	status = smb2cli_sesssetup_ntlmssp(cli, username, workgroup, password);
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("smb2cli_sesssetup returned %s\n", nt_errstr(status));
 		return false;


-- 
Samba Shared Repository