summaryrefslogtreecommitdiff
path: root/source4/libcli/composite/sesssetup.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-01-16 21:58:28 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:08:54 -0500
commit99d30a901f04eac38922112c00a211e8fdb575a5 (patch)
treec1ea5f5e02ec6f54ccaba008887430bde538b61b /source4/libcli/composite/sesssetup.c
parent5dbebbe2add359da8c416634e3ec2d8e2569478a (diff)
downloadsamba-99d30a901f04eac38922112c00a211e8fdb575a5.tar.gz
samba-99d30a901f04eac38922112c00a211e8fdb575a5.tar.bz2
samba-99d30a901f04eac38922112c00a211e8fdb575a5.zip
r4782: volker quite rightly pointed out that there is too much of a
proliferation of void* in the composite code. This removes two of the void* pointers from the main composite structure. (This used to be commit 5a89a5ed0fa022fb380bf72065904633270f34aa)
Diffstat (limited to 'source4/libcli/composite/sesssetup.c')
-rw-r--r--source4/libcli/composite/sesssetup.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/libcli/composite/sesssetup.c b/source4/libcli/composite/sesssetup.c
index 597c8d7923..7053c9f9e5 100644
--- a/source4/libcli/composite/sesssetup.c
+++ b/source4/libcli/composite/sesssetup.c
@@ -30,6 +30,7 @@
struct sesssetup_state {
union smb_sesssetup setup;
NTSTATUS session_key_err;
+ struct smb_composite_sesssetup *io;
};
@@ -93,7 +94,6 @@ static void request_handler(struct smbcli_request *req)
{
struct smbcli_composite *c = req->async.private;
struct sesssetup_state *state = c->private;
- struct smb_composite_sesssetup *io = c->composite_parms;
struct smbcli_session *session = req->session;
DATA_BLOB session_key = data_blob(NULL, 0);
DATA_BLOB null_data_blob = data_blob(NULL, 0);
@@ -102,15 +102,15 @@ static void request_handler(struct smbcli_request *req)
switch (state->setup.old.level) {
case RAW_SESSSETUP_OLD:
- io->out.vuid = state->setup.old.out.vuid;
+ state->io->out.vuid = state->setup.old.out.vuid;
break;
case RAW_SESSSETUP_NT1:
- io->out.vuid = state->setup.nt1.out.vuid;
+ state->io->out.vuid = state->setup.nt1.out.vuid;
break;
case RAW_SESSSETUP_SPNEGO:
- session->vuid = io->out.vuid = state->setup.spnego.out.vuid;
+ session->vuid = state->io->out.vuid = state->setup.spnego.out.vuid;
if (!NT_STATUS_EQUAL(c->status, NT_STATUS_MORE_PROCESSING_REQUIRED) &&
!NT_STATUS_IS_OK(c->status)) {
break;
@@ -142,7 +142,7 @@ static void request_handler(struct smbcli_request *req)
}
/* enforce the local signing required flag */
- if (NT_STATUS_IS_OK(c->status) && io->in.user && io->in.user[0]) {
+ if (NT_STATUS_IS_OK(c->status) && state->io->in.user && state->io->in.user[0]) {
if (!session->transport->negotiate.sign_info.doing_signing
&& session->transport->negotiate.sign_info.mandatory_signing) {
DEBUG(0, ("SMB signing required, but server does not support it\n"));
@@ -346,11 +346,11 @@ struct smbcli_composite *smb_composite_sesssetup_send(struct smbcli_session *ses
state = talloc(c, struct sesssetup_state);
if (state == NULL) goto failed;
+ state->io = io;
+
c->state = SMBCLI_REQUEST_SEND;
- c->req_parms = io;
c->private = state;
c->event_ctx = session->transport->socket->event.ctx;
- c->composite_parms = io;
/* no session setup at all in earliest protocol varients */
if (session->transport->negotiate.protocol < PROTOCOL_LANMAN1) {