diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-12-13 20:47:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:29:15 -0500 |
| commit | bddd8ed5c4cf13305bc42b3873b731a7b011010d (patch) | |
| tree | fa993b1c8b22ea167421284d25e3b2c2b87e3126 | |
| parent | d471e52d23bf89e472c34c58dd9f113e669323a4 (diff) | |
| download | samba-bddd8ed5c4cf13305bc42b3873b731a7b011010d.tar.gz samba-bddd8ed5c4cf13305bc42b3873b731a7b011010d.tar.bz2 samba-bddd8ed5c4cf13305bc42b3873b731a7b011010d.zip | |
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
(This used to be commit dc9eee7cb37e4a6828c2cba23b0d836df9eac7b5)
| -rw-r--r-- | source4/kdc/kdc.c | 3 | ||||
| -rw-r--r-- | source4/setup/provision.ldif | 1 | ||||
| -rw-r--r-- | source4/setup/provision.smb.conf | 2 | ||||
| -rw-r--r-- | source4/setup/provision_basedn_modify.ldif | 3 |
4 files changed, 6 insertions, 3 deletions
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c index 7d6155e1c0..ce7c1f57cb 100644 --- a/source4/kdc/kdc.c +++ b/source4/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/source4/setup/provision.ldif b/source4/setup/provision.ldif index c047d6d93a..4526ee515c 100644 --- a/source4/setup/provision.ldif +++ b/source4/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/source4/setup/provision.smb.conf b/source4/setup/provision.smb.conf index e99c82a91a..9d922c49c9 100644 --- a/source4/setup/provision.smb.conf +++ b/source4/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/source4/setup/provision_basedn_modify.ldif b/source4/setup/provision_basedn_modify.ldif index ca02975a0e..e3baaa5118 100644 --- a/source4/setup/provision_basedn_modify.ldif +++ b/source4/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 - |