r24694: Remove objectCategory entries from the setup templates. These can be

autogenerated by the objectclass module when the the entries are
added.

Andrew Bartlett
(This used to be commit 79e13349f00d009fc5dd0cdddade379df906ebc8)

6 files changed, 0 insertions, 47 deletions

diff --git a/source4/setup/provision.ldif b/source4/setup/provision.ldif
index d531f831d6..c6b07c5751 100644
--- a/source4/setup/provision.ldif
+++ b/source4/setup/provision.ldif
@@ -6,7 +6,6 @@ description: Default container for domain controllers
 instanceType: 4
 showInAdvancedViewOnly: FALSE
 systemFlags: 2348810240
-objectCategory: CN=Container,${SCHEMADN}
 isCriticalSystemObject: TRUE
 
 dn: CN=ForeignSecurityPrincipals,${DOMAINDN}
@@ -17,7 +16,6 @@ description: Default container for security identifiers (SIDs) associated with o
 instanceType: 4
 showInAdvancedViewOnly: FALSE
 systemFlags: 2348810240
-objectCategory: CN=Container,${SCHEMADN}
 isCriticalSystemObject: TRUE
 
 dn: CN=System,${DOMAINDN}
@@ -28,7 +26,6 @@ description: Builtin system settings
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 2348810240
-objectCategory: CN=Container,${SCHEMADN}
 isCriticalSystemObject: TRUE
 
 dn: CN=RID Manager$,CN=System,${DOMAINDN}
@@ -38,7 +35,6 @@ cn: RID Manager$
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 2348810240
-objectCategory: CN=RID-Manager,${SCHEMADN}
 isCriticalSystemObject: TRUE
 fSMORoleOwner: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
 rIDAvailablePool: 4611686014132423217
@@ -49,7 +45,6 @@ objectClass: container
 cn: DomainUpdates
 instanceType: 4
 showInAdvancedViewOnly: TRUE
-objectCategory: CN=Container,${SCHEMADN}
 
 dn: CN=Windows2003Update,CN=DomainUpdates,CN=System,${DOMAINDN}
 objectClass: top
@@ -57,7 +52,6 @@ objectClass: container
 cn: Windows2003Update
 instanceType: 4
 showInAdvancedViewOnly: TRUE
-objectCategory: CN=Container,${SCHEMADN}
 revision: 8
 
 dn: CN=Infrastructure,${DOMAINDN}
@@ -67,7 +61,6 @@ cn: Infrastructure
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 2348810240
-objectCategory: CN=Infrastructure-Update,${SCHEMADN}
 isCriticalSystemObject: TRUE
 fSMORoleOwner: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
 
@@ -92,7 +85,6 @@ objectSid: S-1-5-32
 serverState: 1
 uASCompat: 1
 modifiedCount: 1
-objectCategory: CN=Builtin-Domain,${SCHEMADN}
 isCriticalSystemObject: TRUE
 
 dn: CN=Policies,CN=System,${DOMAINDN}
diff --git a/source4/setup/provision_computers_modify.ldif b/source4/setup/provision_computers_modify.ldif
index 9f0c1884ea..b7502e5107 100644
--- a/source4/setup/provision_computers_modify.ldif
+++ b/source4/setup/provision_computers_modify.ldif
@@ -12,8 +12,5 @@ showInAdvancedViewOnly: FALSE
 replace: systemFlags
 systemFlags: 2348810240
 -
-replace: objectCategory
-objectCategory: CN=Container,${SCHEMADN}
--
 replace: isCriticalSystemObject
 isCriticalSystemObject: TRUE
diff --git a/source4/setup/provision_configuration.ldif b/source4/setup/provision_configuration.ldif
index 24f68b63c8..0e6ee4d845 100644
--- a/source4/setup/provision_configuration.ldif
+++ b/source4/setup/provision_configuration.ldif
@@ -8,7 +8,6 @@ cn: Partitions
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 2147483648
-objectCategory: CN=Cross-Ref-Container,${SCHEMADN}
 msDS-Behavior-Version: 0
 fSMORoleOwner: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
 
@@ -19,7 +18,6 @@ cn: Enterprise Configuration
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 1
-objectCategory: CN=Cross-Ref,${SCHEMADN}
 nCName: ${CONFIGDN}
 dnsRoot: ${DNSDOMAIN}
 
@@ -30,7 +28,6 @@ cn: Enterprise Schema
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 1
-objectCategory: CN=Cross-Ref,${SCHEMADN}
 nCName: ${SCHEMADN}
 dnsRoot: ${DNSDOMAIN}
 
@@ -41,7 +38,6 @@ cn: ${DOMAIN}
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 3
-objectCategory: CN=Cross-Ref,${SCHEMADN}
 nCName: ${DOMAINDN}
 nETBIOSName: ${DOMAIN}
 dnsRoot: ${DNSDOMAIN}
@@ -53,7 +49,6 @@ cn: Sites
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 2181038080
-objectCategory: CN=Sites-Container,${SCHEMADN}
 
 dn: CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
 objectClass: top
@@ -62,7 +57,6 @@ cn: ${DEFAULTSITE}
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 2181038080
-objectCategory: CN=Site,${SCHEMADN}
 
 dn: CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
 objectClass: top
@@ -71,7 +65,6 @@ cn: Servers
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 2181038080
-objectCategory: CN=Servers-Container,${SCHEMADN}
 
 dn: CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
 objectClass: top
@@ -80,7 +73,6 @@ cn: ${NETBIOSNAME}
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 1375731712
-objectCategory: CN=Server,${SCHEMADN}
 dNSHostName: ${DNSNAME}
 serverReference: CN=${NETBIOSNAME},OU=Domain Controllers,${DOMAINDN}
 
@@ -93,7 +85,6 @@ options: 1
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 33554432
-objectCategory: CN=NTDS-DSA,${SCHEMADN}
 dMDLocation: ${SCHEMADN}
 invocationId: ${INVOCATIONID}
 msDS-Behavior-Version: 2
@@ -105,7 +96,6 @@ cn: Services
 instanceType: 4
 showInAdvancedViewOnly: TRUE
 systemFlags: 2147483648
-objectCategory: CN=Container,${SCHEMADN}
 
 dn: CN=Windows NT,CN=Services,${CONFIGDN}
 objectClass: top
@@ -113,7 +103,6 @@ objectClass: container
 cn: Windows NT
 instanceType: 4
 showInAdvancedViewOnly: TRUE
-objectCategory: CN=Container,${SCHEMADN}
 
 dn: CN=Directory Service,CN=Windows NT,CN=Services,${CONFIGDN}
 objectClass: top
@@ -121,7 +110,6 @@ objectClass: nTDSService
 cn: Directory Service
 instanceType: 4
 showInAdvancedViewOnly: TRUE
-objectCategory: CN=NTDS-Service,${SCHEMADN}
 sPNMappings: host=ldap,dns,cifs,http
 
 dn: CN=Query-Policies,CN=Directory Service,CN=Windows NT,CN=Services,${CONFIGDN}
@@ -130,7 +118,6 @@ objectClass: container
 cn: Query-Policies
 instanceType: 4
 showInAdvancedViewOnly: TRUE
-objectCategory: CN=Container,${SCHEMADN}
 
 dn: CN=Default Query Policy,CN=Query-Policies,CN=Directory Service,CN=Windows NT,CN=Services,${CONFIGDN}
 objectClass: top
@@ -138,7 +125,6 @@ objectClass: queryPolicy
 cn: Default Query Policy
 instanceType: 4
 showInAdvancedViewOnly: TRUE
-objectCategory: CN=Query-Policy,${SCHEMADN}
 lDAPAdminLimits: MaxValRange=1500
 lDAPAdminLimits: MaxReceiveBuffer=10485760
 lDAPAdminLimits: MaxDatagramRecv=4096
diff --git a/source4/setup/provision_group_policy.ldif b/source4/setup/provision_group_policy.ldif
index b5a2ef17e2..0f3e1f15f9 100644
--- a/source4/setup/provision_group_policy.ldif
+++ b/source4/setup/provision_group_policy.ldif
@@ -3,7 +3,6 @@ objectClass: top
 objectClass: container
 objectClass: groupPolicyContainer
 displayName: Default Domain Policy
-objectCategory: CN=Group-Policy-Container,${SCHEMADN}
 gPCFunctionalityVersion: 2
 gPCFileSysPath: \\${DNSDOMAIN}\sysvol\${DNSDOMAIN}\Policies\{${POLICYGUID}}
 versionNumber: 1
@@ -20,9 +19,7 @@ nTSecurityDescriptor: O:${DOMAINSID}-512G:${DOMAINSID}-512D:PAI(A;CI;RPWPCCDCLCL
 dn: CN=User,CN={${POLICYGUID}},CN=Policies,CN=System,${DOMAINDN}
 objectClass: top
 objectClass: container
-objectCategory: CN=Container,${SCHEMADN}
 
 dn: CN=Machine,CN={${POLICYGUID}},CN=Policies,CN=System,${DOMAINDN}
 objectClass: top
 objectClass: container
-objectCategory: CN=Container,${SCHEMADN}
diff --git a/source4/setup/provision_users.ldif b/source4/setup/provision_users.ldif
index f1244fe8a1..fa81784f1e 100644
--- a/source4/setup/provision_users.ldif
+++ b/source4/setup/provision_users.ldif
@@ -40,7 +40,6 @@ sAMAccountName: Administrators
 sAMAccountType: 536870912
 systemFlags: 2348810240
 groupType: 2147483653
-objectCategory: CN=Group,${SCHEMADN}
 isCriticalSystemObject: TRUE
 privilege: SeSecurityPrivilege
 privilege: SeBackupPrivilege
@@ -78,7 +77,6 @@ sAMAccountName: Users
 sAMAccountType: 536870912
 systemFlags: 2348810240
 groupType: 2147483653
-objectCategory: CN=Group,${SCHEMADN}
 isCriticalSystemObject: TRUE
 
 dn: CN=Guests,CN=Builtin,${DOMAINDN}
@@ -93,7 +91,6 @@ sAMAccountName: Guests
 sAMAccountType: 536870912
 systemFlags: 2348810240
 groupType: 2147483653
-objectCategory: CN=Group,${SCHEMADN}
 isCriticalSystemObject: TRUE
 
 dn: CN=Print Operators,CN=Builtin,${DOMAINDN}
@@ -107,7 +104,6 @@ sAMAccountName: Print Operators
 sAMAccountType: 536870912
 systemFlags: 2348810240
 groupType: 2147483653
-objectCategory: CN=Group,${SCHEMADN}
 isCriticalSystemObject: TRUE
 privilege: SeLoadDriverPrivilege
 privilege: SeShutdownPrivilege
@@ -124,7 +120,6 @@ sAMAccountName: Backup Operators
 sAMAccountType: 536870912
 systemFlags: 2348810240
 groupType: 2147483653
-objectCategory: CN=Group,${SCHEMADN}
 isCriticalSystemObject: TRUE
 privilege: SeBackupPrivilege
 privilege: SeRestorePrivilege
@@ -142,7 +137,6 @@ sAMAccountName: Replicator
 sAMAccountType: 536870912
 systemFlags: 2348810240
 groupType: 2147483653
-objectCategory: CN=Group,${SCHEMADN}
 isCriticalSystemObject: TRUE
 
 dn: CN=Remote Desktop Users,CN=Builtin,${DOMAINDN}
@@ -155,7 +149,6 @@ sAMAccountName: Remote Desktop Users
 sAMAccountType: 536870912
 systemFlags: 2348810240
 groupType: 2147483653
-objectCategory: CN=Group,${SCHEMADN}
 isCriticalSystemObject: TRUE
 
 dn: CN=Network Configuration Operators,CN=Builtin,${DOMAINDN}
@@ -168,7 +161,6 @@ sAMAccountName: Network Configuration Operators
 sAMAccountType: 536870912
 systemFlags: 2348810240
 groupType: 2147483653
-objectCategory: CN=Group,${SCHEMADN}
 isCriticalSystemObject: TRUE
 
 dn: CN=Performance Monitor Users,CN=Builtin,${DOMAINDN}
@@ -181,7 +173,6 @@ sAMAccountName: Performance Monitor Users
 sAMAccountType: 536870912
 systemFlags: 2348810240
 groupType: 2147483653
-objectCategory: CN=Group,${SCHEMADN}
 isCriticalSystemObject: TRUE
 
 dn: CN=Performance Log Users,CN=Builtin,${DOMAINDN}
@@ -194,7 +185,6 @@ sAMAccountName: Performance Log Users
 sAMAccountType: 536870912
 systemFlags: 2348810240
 groupType: 2147483653
-objectCategory: CN=Group,${SCHEMADN}
 isCriticalSystemObject: TRUE
 
 dn: CN=krbtgt,CN=Users,${DOMAINDN}
@@ -222,7 +212,6 @@ cn: Domain Computers
 description: All workstations and servers joined to the domain
 objectSid: ${DOMAINSID}-515
 sAMAccountName: Domain Computers
-objectCategory: CN=Group,${SCHEMADN}
 isCriticalSystemObject: TRUE
 
 dn: CN=Domain Controllers,CN=Users,${DOMAINDN}
@@ -267,7 +256,6 @@ groupType: 2147483652
 sAMAccountType: 536870912
 objectSid: ${DOMAINSID}-517
 sAMAccountName: Cert Publishers
-objectCategory: CN=Group,${SCHEMADN}
 isCriticalSystemObject: TRUE
 
 dn: CN=Domain Admins,CN=Users,${DOMAINDN}
@@ -310,7 +298,6 @@ description: Members in this group can modify group policy for the domain
 member: CN=Administrator,CN=Users,${DOMAINDN}
 objectSid: ${DOMAINSID}-520
 sAMAccountName: Group Policy Creator Owners
-objectCategory: CN=Group,${SCHEMADN}
 isCriticalSystemObject: TRUE
 
 dn: CN=RAS and IAS Servers,CN=Users,${DOMAINDN}
@@ -323,7 +310,6 @@ objectSid: ${DOMAINSID}-553
 sAMAccountName: RAS and IAS Servers
 sAMAccountType: 536870912
 groupType: 2147483652
-objectCategory: CN=Group,${SCHEMADN}
 isCriticalSystemObject: TRUE
 
 dn: CN=Server Operators,CN=Builtin,${DOMAINDN}
@@ -338,7 +324,6 @@ sAMAccountName: Server Operators
 sAMAccountType: 536870912
 systemFlags: 2348810240
 groupType: 2147483653
-objectCategory: CN=Group,${SCHEMADN}
 isCriticalSystemObject: TRUE
 privilege: SeBackupPrivilege
 privilege: SeSystemtimePrivilege
@@ -359,7 +344,6 @@ sAMAccountName: Account Operators
 sAMAccountType: 536870912
 systemFlags: 2348810240
 groupType: 2147483653
-objectCategory: CN=Group,${SCHEMADN}
 isCriticalSystemObject: TRUE
 privilege: SeInteractiveLogonRight
 
diff --git a/source4/setup/provision_users_modify.ldif b/source4/setup/provision_users_modify.ldif
index 5fbfebfd46..42dff07080 100644
--- a/source4/setup/provision_users_modify.ldif
+++ b/source4/setup/provision_users_modify.ldif
@@ -12,8 +12,5 @@ showInAdvancedViewOnly: FALSE
 replace: systemFlags
 systemFlags: 2348810240
 -
-replace: objectCategory
-objectCategory: CN=Container,${SCHEMADN}
--
 replace: isCriticalSystemObject
 isCriticalSystemObject: TRUE