svn commit: samba r20152 - in branches/SAMBA_4_0/source: kdc setup

[abartlet at samba.org]

Author: abartlet
Date: 2006-12-13 20:47:24 +0000 (Wed, 13 Dec 2006)
New Revision: 20152

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

Log:
Commit missing files from last night's commit.  We no longer maintain
a distinction between PDC and BDC in the configuration files, only as
an entry in the ldb.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/kdc/kdc.c
   branches/SAMBA_4_0/source/setup/provision.ldif
   branches/SAMBA_4_0/source/setup/provision.smb.conf
   branches/SAMBA_4_0/source/setup/provision_basedn_modify.ldif


Changeset:
Modified: branches/SAMBA_4_0/source/kdc/kdc.c
===================================================================
--- branches/SAMBA_4_0/source/kdc/kdc.c	2006-12-13 18:29:00 UTC (rev 20151)
+++ branches/SAMBA_4_0/source/kdc/kdc.c	2006-12-13 20:47:24 UTC (rev 20152)
@@ -543,8 +543,7 @@
 	case ROLE_DOMAIN_MEMBER:
 		task_server_terminate(task, "kdc: no KDC required in member server configuration");
 		return;
-	case ROLE_DOMAIN_PDC:
-	case ROLE_DOMAIN_BDC:
+	case ROLE_DOMAIN_CONTROLLER:
 		/* Yes, we want a KDC */
 		break;
 	}

Modified: branches/SAMBA_4_0/source/setup/provision.ldif
===================================================================
--- branches/SAMBA_4_0/source/setup/provision.ldif	2006-12-13 18:29:00 UTC (rev 20151)
+++ branches/SAMBA_4_0/source/setup/provision.ldif	2006-12-13 20:47:24 UTC (rev 20152)
@@ -221,6 +221,7 @@
 objectClass: applicationSettings
 objectClass: nTDSDSA
 cn: NTDS Settings
+options: 1
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 33554432

Modified: branches/SAMBA_4_0/source/setup/provision.smb.conf
===================================================================
--- branches/SAMBA_4_0/source/setup/provision.smb.conf	2006-12-13 18:29:00 UTC (rev 20151)
+++ branches/SAMBA_4_0/source/setup/provision.smb.conf	2006-12-13 20:47:24 UTC (rev 20152)
@@ -2,6 +2,6 @@
 	netbios name	= ${HOSTNAME}
 	workgroup	= ${DOMAIN}
 	realm		= ${REALM}
-	server role     = pdc
+	server role     = domain controller
 
 

Modified: branches/SAMBA_4_0/source/setup/provision_basedn_modify.ldif
===================================================================
--- branches/SAMBA_4_0/source/setup/provision_basedn_modify.ldif	2006-12-13 18:29:00 UTC (rev 20151)
+++ branches/SAMBA_4_0/source/setup/provision_basedn_modify.ldif	2006-12-13 20:47:24 UTC (rev 20152)
@@ -69,6 +69,9 @@
 replace: objectCategory
 objectCategory: CN=Domain-DNS,CN=Schema,CN=Configuration,${BASEDN}
 -
+replace: fSMORoleOwner
+fSMORoleOwner: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,CN=Configuration,${BASEDN}
+-
 replace: isCriticalSystemObject
 isCriticalSystemObject: TRUE
 -