svn commit: samba r6620 - in branches/SAMBA_4_0/source: auth/gensec librpc/idl

[tridge at samba.org]

Author: tridge
Date: 2005-05-05 11:15:24 +0000 (Thu, 05 May 2005)
New Revision: 6620

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

Log:
the type 23 schannel bind uses a workstation name, not an account name



Modified:
   branches/SAMBA_4_0/source/auth/gensec/schannel.c
   branches/SAMBA_4_0/source/librpc/idl/schannel.idl


Changeset:
Modified: branches/SAMBA_4_0/source/auth/gensec/schannel.c
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/schannel.c	2005-05-05 11:14:43 UTC (rev 6619)
+++ branches/SAMBA_4_0/source/auth/gensec/schannel.c	2005-05-05 11:15:24 UTC (rev 6620)
@@ -64,9 +64,12 @@
 		/* to support this we'd need to have access to the full domain name */
 		bind_schannel.bind_type = 23;
 		bind_schannel.u.info23.domain = cli_credentials_get_domain(gensec_security->credentials);
-		bind_schannel.u.info23.account_name = cli_credentials_get_username(gensec_security->credentials);
-		bind_schannel.u.info23.dnsdomain = str_format_nbt_domain(out_mem_ctx, fulldomainname);
-		bind_schannel.u.info23.workstation = str_format_nbt_domain(out_mem_ctx, cli_credentials_get_workstation(gensec_security->credentials));
+		bind_schannel.u.info23.workstation = cli_credentials_get_workstation(gensec_security->credentials);
+		bind_schannel.u.info23.dnsdomain = cli_credentials_get_realm(gensec_security->credentials);
+		/* w2k3 refuses us if we use the full DNS workstation?
+		 why? perhaps because we don't fill in the dNSHostName
+		 attribute in the machine account? */
+		bind_schannel.u.info23.dnsworkstation = cli_credentials_get_workstation(gensec_security->credentials);
 #else
 		bind_schannel.bind_type = 3;
 		bind_schannel.u.info3.domain = cli_credentials_get_domain(gensec_security->credentials);

Modified: branches/SAMBA_4_0/source/librpc/idl/schannel.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/schannel.idl	2005-05-05 11:14:43 UTC (rev 6619)
+++ branches/SAMBA_4_0/source/librpc/idl/schannel.idl	2005-05-05 11:15:24 UTC (rev 6620)
@@ -20,9 +20,9 @@
 
 	typedef struct {
 		astring domain;
-		astring account_name;
-		nbt_string dnsdomain; /* in NBT dotted format */
-		nbt_string workstation;
+		astring workstation;
+		nbt_string dnsdomain;
+		nbt_string dnsworkstation;
 	} schannel_bind_23;
 
 	typedef [nodiscriminant] union {