svn commit: samba r23815 - in branches/SAMBA_4_0/source: rpc_server/samr setup

[abartlet at samba.org]

Author: abartlet
Date: 2007-07-10 13:26:10 +0000 (Tue, 10 Jul 2007)
New Revision: 23815

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

Log:
Thanks to Matthias Wallnoefer <mwallnoefer at yahoo.de> for pointing out
that we had the wrong objectClass for OU=Domain
Controllers,${DOMAINDN} (was CN=Domain Controllers,${DOMAINDN})

This fixes both the SAMR server and the LDIF templates.

Andrew Bartlett


Modified:
   branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c
   branches/SAMBA_4_0/source/setup/provision.ldif
   branches/SAMBA_4_0/source/setup/provision_self_join.ldif


Changeset:
Modified: branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c	2007-07-10 12:34:12 UTC (rev 23814)
+++ branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c	2007-07-10 13:26:10 UTC (rev 23815)
@@ -1236,7 +1236,7 @@
 
 	/* This must be one of these values *only* */
 	if (r->in.acct_flags == ACB_NORMAL) {
-		container = "Users";
+		container = "CN=Users";
 		obj_class = "user";
 
 	} else if (r->in.acct_flags == ACB_WSTRUST) {
@@ -1244,7 +1244,7 @@
 			return NT_STATUS_FOOBAR;
 		}
 		cn_name[cn_name_len - 1] = '\0';
-		container = "Computers";
+		container = "CN=Computers";
 		obj_class = "computer";
 
 	} else if (r->in.acct_flags == ACB_SVRTRUST) {
@@ -1252,11 +1252,11 @@
 			return NT_STATUS_FOOBAR;		
 		}
 		cn_name[cn_name_len - 1] = '\0';
-		container = "Domain Controllers";
+		container = "OU=Domain Controllers";
 		obj_class = "computer";
 
 	} else if (r->in.acct_flags == ACB_DOMTRUST) {
-		container = "Users";
+		container = "CN=Users";
 		obj_class = "user";
 
 	} else {
@@ -1266,7 +1266,7 @@
 
 	/* add core elements to the ldb_message for the user */
 	msg->dn = ldb_dn_copy(mem_ctx, d_state->domain_dn);
-	if ( ! ldb_dn_add_child_fmt(msg->dn, "CN=%s,CN=%s", cn_name, container)) {
+	if ( ! ldb_dn_add_child_fmt(msg->dn, "CN=%s,%s", cn_name, container)) {
 		ldb_transaction_cancel(d_state->sam_ctx);
 		return NT_STATUS_FOOBAR;
 	}

Modified: branches/SAMBA_4_0/source/setup/provision.ldif
===================================================================
--- branches/SAMBA_4_0/source/setup/provision.ldif	2007-07-10 12:34:12 UTC (rev 23814)
+++ branches/SAMBA_4_0/source/setup/provision.ldif	2007-07-10 13:26:10 UTC (rev 23815)
@@ -1,6 +1,6 @@
-dn: CN=Domain Controllers,${DOMAINDN}
+dn: OU=Domain Controllers,${DOMAINDN}
 objectClass: top
-objectClass: container
+objectClass: organizationalUnit
 cn: Domain Controllers
 description: Default container for domain controllers
 instanceType: 4

Modified: branches/SAMBA_4_0/source/setup/provision_self_join.ldif
===================================================================
--- branches/SAMBA_4_0/source/setup/provision_self_join.ldif	2007-07-10 12:34:12 UTC (rev 23814)
+++ branches/SAMBA_4_0/source/setup/provision_self_join.ldif	2007-07-10 13:26:10 UTC (rev 23815)
@@ -1,6 +1,6 @@
 #Join the DC to itself by default
 
-dn: CN=${NETBIOSNAME},CN=Domain Controllers,${DOMAINDN}
+dn: CN=${NETBIOSNAME},OU=Domain Controllers,${DOMAINDN}
 objectClass: computer
 cn: ${NETBIOSNAME}
 userAccountControl: 532480