r20553: add ${CONFIGDN} and ${SCHEMADN} instead of using hardcoded paths

under ${BASEDN}

metze
(This used to be commit 09ca6aae12d8e10b76971cf269f7c62f228a4c87)

1 files changed, 42 insertions, 42 deletions

diff --git a/source4/setup/provision_configuration.ldif b/source4/setup/provision_configuration.ldif
index d76b7afc72..b6eaa30529 100644
--- a/source4/setup/provision_configuration.ldif
+++ b/source4/setup/provision_configuration.ldif
@@ -1,101 +1,101 @@
 ###############################
 # Configuration Naming Context
 ###############################
-dn: CN=Configuration,${BASEDN}
+dn: ${CONFIGDN}
 objectClass: top
 objectClass: configuration
 cn: Configuration
 instanceType: 13
 showInAdvancedViewOnly: TRUE
-objectCategory: CN=Configuration,CN=Schema,CN=Configuration,${BASEDN}
-subRefs: CN=Schema,CN=Configuration,${BASEDN}
-masteredBy: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,CN=Configuration,${BASEDN}
-msDs-masteredBy: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,CN=Configuration,${BASEDN}
+objectCategory: CN=Configuration,${SCHEMADN}
+subRefs: ${SCHEMADN}
+masteredBy: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
+msDs-masteredBy: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
 
-dn: CN=Partitions,CN=Configuration,${BASEDN}
+dn: CN=Partitions,${CONFIGDN}
 objectClass: top
 objectClass: crossRefContainer
 cn: Partitions
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 2147483648
-objectCategory: CN=Cross-Ref-Container,CN=Schema,CN=Configuration,${BASEDN}
+objectCategory: CN=Cross-Ref-Container,${SCHEMADN}
 msDS-Behavior-Version: 0
-fSMORoleOwner: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,CN=Configuration,${BASEDN}
+fSMORoleOwner: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
 
-dn: CN=Enterprise Configuration,CN=Partitions,CN=Configuration,${BASEDN}
+dn: CN=Enterprise Configuration,CN=Partitions,${CONFIGDN}
 objectClass: top
 objectClass: crossRef
 cn: Enterprise Configuration
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 1
-objectCategory: CN=Cross-Ref,CN=Schema,CN=Configuration,${BASEDN}
-nCName: CN=Configuration,${BASEDN}
+objectCategory: CN=Cross-Ref,${SCHEMADN}
+nCName: ${CONFIGDN}
 dnsRoot: ${DNSDOMAIN}
 
-dn: CN=Enterprise Schema,CN=Partitions,CN=Configuration,${BASEDN}
+dn: CN=Enterprise Schema,CN=Partitions,${CONFIGDN}
 objectClass: top
 objectClass: crossRef
 cn: Enterprise Schema
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 1
-objectCategory: CN=Cross-Ref,CN=Schema,CN=Configuration,${BASEDN}
-nCName: CN=Schema,CN=Configuration,${BASEDN}
+objectCategory: CN=Cross-Ref,${SCHEMADN}
+nCName: ${SCHEMADN}
 dnsRoot: ${DNSDOMAIN}
 
-dn: CN=${DOMAIN},CN=Partitions,CN=Configuration,${BASEDN}
+dn: CN=${DOMAIN},CN=Partitions,${CONFIGDN}
 objectClass: top
 objectClass: crossRef
 cn: ${DOMAIN}
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 3
-objectCategory: CN=Cross-Ref,CN=Schema,CN=Configuration,${BASEDN}
+objectCategory: CN=Cross-Ref,${SCHEMADN}
 nCName: ${BASEDN}
 nETBIOSName: ${DOMAIN}
 dnsRoot: ${DNSDOMAIN}
 
-dn: CN=Sites,CN=Configuration,${BASEDN}
+dn: CN=Sites,${CONFIGDN}
 objectClass: top
 objectClass: sitesContainer
 cn: Sites
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 2181038080
-objectCategory: CN=Sites-Container,CN=Schema,CN=Configuration,${BASEDN}
+objectCategory: CN=Sites-Container,${SCHEMADN}
 
-dn: CN=${DEFAULTSITE},CN=Sites,CN=Configuration,${BASEDN}
+dn: CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
 objectClass: top
 objectClass: site
 cn: ${DEFAULTSITE}
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 2181038080
-objectCategory: CN=Site,CN=Schema,CN=Configuration,${BASEDN}
+objectCategory: CN=Site,${SCHEMADN}
 
-dn: CN=Servers,CN=${DEFAULTSITE},CN=Sites,CN=Configuration,${BASEDN}
+dn: CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
 objectClass: top
 objectClass: serversContainer
 cn: Servers
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 2181038080
-objectCategory: CN=Servers-Container,CN=Schema,CN=Configuration,${BASEDN}
+objectCategory: CN=Servers-Container,${SCHEMADN}
 
-dn: CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,CN=Configuration,${BASEDN}
+dn: CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
 objectClass: top
 objectClass: server
 cn: ${NETBIOSNAME}
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 1375731712
-objectCategory: CN=Server,CN=Schema,CN=Configuration,${BASEDN}
+objectCategory: CN=Server,${SCHEMADN}
 dNSHostName: ${DNSNAME}
 serverReference: CN=${NETBIOSNAME},OU=Domain Controllers,${BASEDN}
 
-dn: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,CN=Configuration,${BASEDN}
+dn: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
 objectClass: top
 objectClass: applicationSettings
 objectClass: nTDSDSA
@@ -104,53 +104,53 @@ options: 1
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 33554432
-objectCategory: CN=NTDS-DSA,CN=Schema,CN=Configuration,${BASEDN}
-dMDLocation: CN=Schema,CN=Configuration,${BASEDN}
+objectCategory: CN=NTDS-DSA,${SCHEMADN}
+dMDLocation: ${SCHEMADN}
 objectGUID: ${INVOCATIONID}
 invocationId: ${INVOCATIONID}
 msDS-Behavior-Version: 2
 
-dn: CN=Services,CN=Configuration,${BASEDN}
+dn: CN=Services,${CONFIGDN}
 objectClass: top
 objectClass: container
 cn: Services
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 2147483648
-objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
+objectCategory: CN=Container,${SCHEMADN}
 
-dn: CN=Windows NT,CN=Services,CN=Configuration,${BASEDN}
+dn: CN=Windows NT,CN=Services,${CONFIGDN}
 objectClass: top
 objectClass: container
 cn: Windows NT
 instanceType: 4
 showInAdvancedViewOnly: TRUE
-objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
+objectCategory: CN=Container,${SCHEMADN}
 
-dn: CN=Directory Service,CN=Windows NT,CN=Services,CN=Configuration,${BASEDN}
+dn: CN=Directory Service,CN=Windows NT,CN=Services,${CONFIGDN}
 objectClass: top
 objectClass: nTDSService
 cn: Directory Service
 instanceType: 4
 showInAdvancedViewOnly: TRUE
-objectCategory: CN=NTDS-Service,CN=Schema,CN=Configuration,${BASEDN}
+objectCategory: CN=NTDS-Service,${SCHEMADN}
 sPNMappings: host=ldap,dns,cifs,http
 
-dn: CN=Query-Policies,CN=Directory Service,CN=Windows NT,CN=Services,CN=Configuration,${BASEDN}
+dn: CN=Query-Policies,CN=Directory Service,CN=Windows NT,CN=Services,${CONFIGDN}
 objectClass: top
 objectClass: container
 cn: Query-Policies
 instanceType: 4
 showInAdvancedViewOnly: TRUE
-objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
+objectCategory: CN=Container,${SCHEMADN}
 
-dn: CN=Default Query Policy,CN=Query-Policies,CN=Directory Service,CN=Windows NT,CN=Services,CN=Configuration,${BASEDN}
+dn: CN=Default Query Policy,CN=Query-Policies,CN=Directory Service,CN=Windows NT,CN=Services,${CONFIGDN}
 objectClass: top
 objectClass: queryPolicy
 cn: Default Query Policy
 instanceType: 4
 showInAdvancedViewOnly: TRUE
-objectCategory: CN=Query-Policy,CN=Schema,CN=Configuration,${BASEDN}
+objectCategory: CN=Query-Policy,${SCHEMADN}
 lDAPAdminLimits: MaxValRange=1500
 lDAPAdminLimits: MaxReceiveBuffer=10485760
 lDAPAdminLimits: MaxDatagramRecv=4096
@@ -169,14 +169,14 @@ lDAPAdminLimits: MaxConnections=5000
 ###############################
 # Schema Naming Context
 ###############################
-dn: CN=Schema,CN=Configuration,${BASEDN}
+dn: ${SCHEMADN}
 objectClass: top
 objectClass: dMD
 cn: Schema
 instanceType: 13
 showInAdvancedViewOnly: TRUE
-objectCategory: CN=DMD,CN=Schema,CN=Configuration,${BASEDN}
-masteredBy: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,CN=Configuration,${BASEDN}
-msDs-masteredBy: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,CN=Configuration,${BASEDN}
-fSMORoleOwner: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,CN=Configuration,${BASEDN}
+objectCategory: CN=DMD,${SCHEMADN}
+masteredBy: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
+msDs-masteredBy: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
+fSMORoleOwner: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
 objectVersion: 30