r20152: 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

diff --git a/source/kdc/kdc.c b/source/kdc/kdc.c
index 7d6155e1c0593d1654bc5c8e1fdc17a2bb6dc3fb..ce7c1f57cb198cdcd93595f9665a4592f1d9ff18 100644 (file)
--- a/source/kdc/kdc.c
+++ b/source/kdc/kdc.c
@@ -543,8 +543,7 @@ static void kdc_task_init(struct task_server *task)
        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;
        }

diff --git a/source/setup/provision.ldif b/source/setup/provision.ldif
index c047d6d93a0cc96ad09a913822ec153f380c4f0e..4526ee515c4ef06b8c7b6809768adbf0fbb2c572 100644 (file)
--- a/source/setup/provision.ldif
+++ b/source/setup/provision.ldif
@@ -221,6 +221,7 @@ objectClass: top
 objectClass: applicationSettings
 objectClass: nTDSDSA
 cn: NTDS Settings
+options: 1
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 33554432

diff --git a/source/setup/provision.smb.conf b/source/setup/provision.smb.conf
index e99c82a91a49e78b7c83b496f3bfa9ce0af9b48f..9d922c49c9878d7b6c89a56b09b67633f4474680 100644 (file)
--- a/source/setup/provision.smb.conf
+++ b/source/setup/provision.smb.conf
@@ -2,6 +2,6 @@
        netbios name    = ${HOSTNAME}
        workgroup       = ${DOMAIN}
        realm           = ${REALM}
-       server role     = pdc
+       server role     = domain controller
 
 

diff --git a/source/setup/provision_basedn_modify.ldif b/source/setup/provision_basedn_modify.ldif
index ca02975a0ebabf17507eac35ff09202ad4a55eae..e3baaa51186517d73fb1ee7448f944048674e060 100644 (file)
--- a/source/setup/provision_basedn_modify.ldif
+++ b/source/setup/provision_basedn_modify.ldif
@@ -69,6 +69,9 @@ modifiedCount: 1
 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
 -