From 172cee9adc86ab1950b50ffc008587e6d42585ed Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Tue, 9 Aug 2005 04:11:09 +0000 Subject: r9223: Rename smb_raw_session_setup() to smb_raw_sesssetup(). (This used to be commit 5e6d330e7388e47e1b2bfc96fff07682e90f63a5) --- source4/libcli/cliconnect.c | 2 +- source4/libcli/composite/sesssetup.c | 10 +++++----- source4/libcli/raw/clisession.c | 17 +++++++++-------- 3 files changed, 15 insertions(+), 14 deletions(-) (limited to 'source4') diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c index cc02af1162..aba7f361a2 100644 --- a/source4/libcli/cliconnect.c +++ b/source4/libcli/cliconnect.c @@ -61,7 +61,7 @@ NTSTATUS smbcli_negprot(struct smbcli_state *cli) return smb_raw_negotiate(cli->transport, lp_maxprotocol()); } -/* wrapper around smb_raw_session_setup() */ +/* wrapper around smb_raw_sesssetup() */ NTSTATUS smbcli_session_setup(struct smbcli_state *cli, struct cli_credentials *credentials) { diff --git a/source4/libcli/composite/sesssetup.c b/source4/libcli/composite/sesssetup.c index 43e07993cb..832f7e3d60 100644 --- a/source4/libcli/composite/sesssetup.c +++ b/source4/libcli/composite/sesssetup.c @@ -79,7 +79,7 @@ static void request_handler(struct smbcli_request *req) DATA_BLOB session_key = data_blob(NULL, 0); DATA_BLOB null_data_blob = data_blob(NULL, 0); - c->status = smb_raw_session_setup_recv(req, state, &state->setup); + c->status = smb_raw_sesssetup_recv(req, state, &state->setup); switch (state->setup.old.level) { case RAW_SESSSETUP_OLD: @@ -115,7 +115,7 @@ static void request_handler(struct smbcli_request *req) smbcli_transport_simple_set_signing(session->transport, session_key, null_data_blob); } - state->req = smb_raw_session_setup_send(session, &state->setup); + state->req = smb_raw_sesssetup_send(session, &state->setup); state->req->async.fn = request_handler; state->req->async.private = c; return; @@ -221,7 +221,7 @@ static struct smbcli_request *session_setup_nt1(struct composite_context *c, return NULL; } - return smb_raw_session_setup_send(session, &state->setup); + return smb_raw_sesssetup_send(session, &state->setup); } @@ -256,7 +256,7 @@ static struct smbcli_request *session_setup_old(struct composite_context *c, strlen(password)); } - return smb_raw_session_setup_send(session, &state->setup); + return smb_raw_sesssetup_send(session, &state->setup); } @@ -344,7 +344,7 @@ static struct smbcli_request *session_setup_spnego(struct composite_context *c, smbcli_transport_simple_set_signing(session->transport, session_key, null_data_blob); } - return smb_raw_session_setup_send(session, &state->setup); + return smb_raw_sesssetup_send(session, &state->setup); } diff --git a/source4/libcli/raw/clisession.c b/source4/libcli/raw/clisession.c index 130959e776..2942279b12 100644 --- a/source4/libcli/raw/clisession.c +++ b/source4/libcli/raw/clisession.c @@ -78,7 +78,8 @@ struct smbcli_session *smbcli_session_init(struct smbcli_transport *transport, /**************************************************************************** Perform a session setup (async send) ****************************************************************************/ -struct smbcli_request *smb_raw_session_setup_send(struct smbcli_session *session, union smb_sesssetup *parms) +struct smbcli_request *smb_raw_sesssetup_send(struct smbcli_session *session, + union smb_sesssetup *parms) { struct smbcli_request *req = NULL; @@ -150,9 +151,9 @@ struct smbcli_request *smb_raw_session_setup_send(struct smbcli_session *session /**************************************************************************** Perform a session setup (async recv) ****************************************************************************/ -NTSTATUS smb_raw_session_setup_recv(struct smbcli_request *req, - TALLOC_CTX *mem_ctx, - union smb_sesssetup *parms) +NTSTATUS smb_raw_sesssetup_recv(struct smbcli_request *req, + TALLOC_CTX *mem_ctx, + union smb_sesssetup *parms) { uint16_t len; uint8_t *p; @@ -222,11 +223,11 @@ failed: /* Perform a session setup (sync interface) */ -NTSTATUS smb_raw_session_setup(struct smbcli_session *session, TALLOC_CTX *mem_ctx, - union smb_sesssetup *parms) +NTSTATUS smb_raw_sesssetup(struct smbcli_session *session, + TALLOC_CTX *mem_ctx, union smb_sesssetup *parms) { - struct smbcli_request *req = smb_raw_session_setup_send(session, parms); - return smb_raw_session_setup_recv(req, mem_ctx, parms); + struct smbcli_request *req = smb_raw_sesssetup_send(session, parms); + return smb_raw_sesssetup_recv(req, mem_ctx, parms); } -- cgit