summaryrefslogtreecommitdiff
path: root/source4/setup
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-10-01 21:08:53 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:07:37 -0500
commit999d47e41e661d2a35d394000d516caa76a89779 (patch)
tree85fc2f5a0b5220e13771b70cbdd0b5643500debd /source4/setup
parent43890c4c58d6323697d8005911e9f3c91bbd4055 (diff)
downloadsamba-999d47e41e661d2a35d394000d516caa76a89779.tar.gz
samba-999d47e41e661d2a35d394000d516caa76a89779.tar.bz2
samba-999d47e41e661d2a35d394000d516caa76a89779.zip
r25452: Move the creation of the server entry to the self join, as this makes
no sense on a member server. Andrew Bartlett (This used to be commit 70467fa4c5d25b83c48dbbeb8236d5acb4550e77)
Diffstat (limited to 'source4/setup')
-rw-r--r--source4/setup/provision_configuration.ldif23
-rw-r--r--source4/setup/provision_self_join.ldif23
2 files changed, 23 insertions, 23 deletions
diff --git a/source4/setup/provision_configuration.ldif b/source4/setup/provision_configuration.ldif
index 0e6ee4d845..050f110d9a 100644
--- a/source4/setup/provision_configuration.ldif
+++ b/source4/setup/provision_configuration.ldif
@@ -66,29 +66,6 @@ instanceType: 4
showInAdvancedViewOnly: TRUE
systemFlags: 2181038080
-dn: CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
-objectClass: top
-objectClass: server
-cn: ${NETBIOSNAME}
-instanceType: 4
-showInAdvancedViewOnly: TRUE
-systemFlags: 1375731712
-dNSHostName: ${DNSNAME}
-serverReference: CN=${NETBIOSNAME},OU=Domain Controllers,${DOMAINDN}
-
-dn: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
-objectClass: top
-objectClass: applicationSettings
-objectClass: nTDSDSA
-cn: NTDS Settings
-options: 1
-instanceType: 4
-showInAdvancedViewOnly: TRUE
-systemFlags: 33554432
-dMDLocation: ${SCHEMADN}
-invocationId: ${INVOCATIONID}
-msDS-Behavior-Version: 2
-
dn: CN=Services,${CONFIGDN}
objectClass: top
objectClass: container
diff --git a/source4/setup/provision_self_join.ldif b/source4/setup/provision_self_join.ldif
index dca7b7c93e..8c6959dbaa 100644
--- a/source4/setup/provision_self_join.ldif
+++ b/source4/setup/provision_self_join.ldif
@@ -39,3 +39,26 @@ servicePrincipalName: DNS/${DNSDOMAIN}
isCriticalSystemObject: TRUE
sambaPassword:: ${DNSPASS_B64}
+dn: CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
+objectClass: top
+objectClass: server
+cn: ${NETBIOSNAME}
+instanceType: 4
+showInAdvancedViewOnly: TRUE
+systemFlags: 1375731712
+dNSHostName: ${DNSNAME}
+serverReference: CN=${NETBIOSNAME},OU=Domain Controllers,${DOMAINDN}
+
+dn: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
+objectClass: top
+objectClass: applicationSettings
+objectClass: nTDSDSA
+cn: NTDS Settings
+options: 1
+instanceType: 4
+showInAdvancedViewOnly: TRUE
+systemFlags: 33554432
+dMDLocation: ${SCHEMADN}
+invocationId: ${INVOCATIONID}
+msDS-Behavior-Version: 2
+