svn commit: samba r6074 - in branches/SAMBA_4_0/source/libcli/composite: .

[tridge at samba.org]

Author: tridge
Date: 2005-03-26 10:22:02 +0000 (Sat, 26 Mar 2005)
New Revision: 6074

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6074

Log:
fixed non-spnego connections for new credentials code

Modified:
   branches/SAMBA_4_0/source/libcli/composite/sesssetup.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/composite/sesssetup.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/composite/sesssetup.c	2005-03-26 07:08:25 UTC (rev 6073)
+++ branches/SAMBA_4_0/source/libcli/composite/sesssetup.c	2005-03-26 10:22:02 UTC (rev 6074)
@@ -179,6 +179,10 @@
 	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 @@
   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;