summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-03-26 10:22:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:11:17 -0500
commit0c936acc47062f2c3589bd2916c10037c49e0db9 (patch)
tree31f9c22ea4690c1eb4c561b03272751333c28335
parent5ae38fb963cf1907043129b4d423c7bc8fe18fb1 (diff)
downloadsamba-0c936acc47062f2c3589bd2916c10037c49e0db9.tar.gz
samba-0c936acc47062f2c3589bd2916c10037c49e0db9.tar.bz2
samba-0c936acc47062f2c3589bd2916c10037c49e0db9.zip
r6074: fixed non-spnego connections for new credentials code
(This used to be commit ff6663aac8ed475bf65d9c06d7f2447a9827898c)
-rw-r--r--source4/libcli/composite/sesssetup.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/libcli/composite/sesssetup.c b/source4/libcli/composite/sesssetup.c
index 31ca5caed7..a33ace2420 100644
--- a/source4/libcli/composite/sesssetup.c
+++ b/source4/libcli/composite/sesssetup.c
@@ -179,6 +179,10 @@ static struct smbcli_request *session_setup_nt1(struct composite_context *c,
state->setup.nt1.in.capabilities = io->in.capabilities;
state->setup.nt1.in.os = "Unix";
state->setup.nt1.in.lanman = "Samba";
+ state->setup.nt1.in.user = cli_credentials_get_username(io->in.credentials);
+ if (state->setup.nt1.in.user == NULL) return NULL;
+ state->setup.nt1.in.domain = cli_credentials_get_domain(io->in.credentials);
+ if (state->setup.nt1.in.domain == NULL) return NULL;
state->setup.old.in.domain = cli_credentials_get_domain(io->in.credentials);
state->setup.old.in.user = cli_credentials_get_username(io->in.credentials);
@@ -330,7 +334,7 @@ static struct smbcli_request *session_setup_spnego(struct composite_context *c,
the spnego varient
*/
struct composite_context *smb_composite_sesssetup_send(struct smbcli_session *session,
- struct smb_composite_sesssetup *io)
+ struct smb_composite_sesssetup *io)
{
struct composite_context *c;
struct sesssetup_state *state;