svn commit: samba r5900 - in branches/SAMBA_4_0/source: . libnet

[abartlet at samba.org]

Author: abartlet
Date: 2005-03-19 08:11:49 +0000 (Sat, 19 Mar 2005)
New Revision: 5900

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

Log:
Use flatname to specify the netbios domain name (matches what win2k3
uses for trusted domain records) in the secrets join records.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/libnet/libnet_join.c
   branches/SAMBA_4_0/source/secrets.ldif


Changeset:
Modified: branches/SAMBA_4_0/source/libnet/libnet_join.c
===================================================================
--- branches/SAMBA_4_0/source/libnet/libnet_join.c	2005-03-19 06:49:03 UTC (rev 5899)
+++ branches/SAMBA_4_0/source/libnet/libnet_join.c	2005-03-19 08:11:49 UTC (rev 5900)
@@ -375,14 +375,14 @@
 	/* search for the secret record */
 	ret = samdb_search(ldb,
 			   mem_ctx, base_dn, &msgs, attrs,
-			   "(&(cn=%s)(objectclass=primaryDomain))", 
+			   "(&(flatname=%s)(objectclass=primaryDomain))", 
 			   r->generic.in.domain_name);
 	if (ret == 0) {
-		msg->dn = talloc_asprintf(mem_ctx, "cn=%s,%s", 
+		msg->dn = talloc_asprintf(mem_ctx, "flatname=%s,%s", 
 					  r->generic.in.domain_name,
 					  base_dn);
 		
-		samdb_msg_add_string(ldb, mem_ctx, msg, "cn", r->generic.in.domain_name);
+		samdb_msg_add_string(ldb, mem_ctx, msg, "flatname", r->generic.in.domain_name);
 		samdb_msg_add_string(ldb, mem_ctx, msg, "objectClass", "primaryDomain");
 		samdb_msg_add_string(ldb, mem_ctx, msg, "secret", r2.generic.out.join_password);
 

Modified: branches/SAMBA_4_0/source/secrets.ldif
===================================================================
--- branches/SAMBA_4_0/source/secrets.ldif	2005-03-19 06:49:03 UTC (rev 5899)
+++ branches/SAMBA_4_0/source/secrets.ldif	2005-03-19 08:11:49 UTC (rev 5900)
@@ -13,10 +13,10 @@
 objectClass: container
 cn: Primary Domains
 
-dn: CN=${DOMAIN},CN=Primary Domains
+dn: flatname=${DOMAIN},CN=Primary Domains
 objectClass: top
 objectClass: primaryDomain
-cn: ${DOMAIN}
+flatname: ${DOMAIN}
 realm: ${REALM}
 secret: ${JOINPASS}
 whenCreated: ${LDAPTIME}