r8650: Use the timestamps and a new objectguid module rather than placing

boilerplate attributes in every entry in provision.ldif.

The next step will be to use templates.

Andrew Bartlett
(This used to be commit 940ed9827f5ab83b668a60a2b0110567dd54c3e2)

2 files changed, 51 insertions, 201 deletions

diff --git a/source4/setup/provision.ldif b/source4/setup/provision.ldif
index c731e8cae5..bc4505e8a4 100644
--- a/source4/setup/provision.ldif
+++ b/source4/setup/provision.ldif
@@ -1,54 +1,3 @@
-dn: @INDEXLIST
-@IDXATTR: name
-@IDXATTR: sAMAccountName
-@IDXATTR: objectSid
-@IDXATTR: objectClass
-@IDXATTR: member
-@IDXATTR: unixID
-@IDXATTR: unixName
-@IDXATTR: privilege
-
-dn: @ATTRIBUTES
-userPrincipalName: CASE_INSENSITIVE
-servicePrincipalName: CASE_INSENSITIVE
-dnsDomain: CASE_INSENSITIVE
-dnsRoot: CASE_INSENSITIVE
-nETBIOSName: CASE_INSENSITIVE
-cn: CASE_INSENSITIVE
-dc: CASE_INSENSITIVE
-name: CASE_INSENSITIVE
-dn: CASE_INSENSITIVE
-sAMAccountName: CASE_INSENSITIVE
-objectClass: CASE_INSENSITIVE
-unicodePwd: HIDDEN
-ntPwdHash: HIDDEN
-ntPwdHistory: HIDDEN
-lmPwdHash: HIDDEN
-lmPwdHistory: HIDDEN
-createTimestamp: HIDDEN
-modifyTimestamp: HIDDEN
-groupType: INTEGER
-sAMAccountType: INTEGER
-systemFlags: INTEGER
-userAccountControl: INTEGER
-
-dn: @SUBCLASSES
-top: domain
-top: person
-top: group
-domain: domainDNS
-domain: builtinDomain
-person: organizationalPerson
-organizationalPerson: user
-user: computer
-template: userTemplate
-template: groupTemplate
-
-#Add modules to the list to activate them by default
-#beware often order is important
-dn: @MODULES
-@LIST: samldb,timestamps
-
 ###############################
 # Domain Naming Context
 ###############################
@@ -66,8 +15,6 @@ forceLogoff: 0x8000000000000000
 lockoutDuration: -18000000000
 lockOutObservationWindow: -18000000000
 lockoutThreshold: 0
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 maxPwdAge: -37108517437440
@@ -96,13 +43,10 @@ objectClass: container
 cn: Users
 description: Default container for upgraded user accounts
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 showInAdvancedViewOnly: FALSE
 name: Users
-objectGUID: ${NEWGUID}
 systemFlags: 0x8c000000
 objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
 isCriticalSystemObject: TRUE
@@ -113,13 +57,10 @@ objectClass: container
 cn: Computers
 description: Default container for upgraded computer accounts
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 showInAdvancedViewOnly: FALSE
 name: Computers
-objectGUID: ${NEWGUID}
 systemFlags: 0x8c000000
 objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
 isCriticalSystemObject: TRUE
@@ -130,13 +71,10 @@ objectClass: organizationalUnit
 ou: Domain Controllers
 description: Default container for domain controllers
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 showInAdvancedViewOnly: FALSE
 name: Domain Controllers
-objectGUID: ${NEWGUID}
 systemFlags: 0x8c000000
 objectCategory: CN=Organizational-Unit,CN=Schema,CN=Configuration,${BASEDN}
 isCriticalSystemObject: TRUE
@@ -147,13 +85,10 @@ objectClass: container
 cn: ForeignSecurityPrincipals
 description: Default container for security identifiers (SIDs) associated with objects from external, trusted domains
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 showInAdvancedViewOnly: FALSE
 name: ForeignSecurityPrincipals
-objectGUID: ${NEWGUID}
 systemFlags: 0x8c000000
 objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
 isCriticalSystemObject: TRUE
@@ -164,13 +99,10 @@ objectClass: container
 cn: System
 description: Builtin system settings
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 showInAdvancedViewOnly: TRUE
 name: System
-objectGUID: ${NEWGUID}
 systemFlags: 0x8c000000
 objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
 isCriticalSystemObject: TRUE
@@ -180,13 +112,10 @@ objectclass: top
 objectclass: rIDManager
 cn: RID Manager$
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 showInAdvancedViewOnly: TRUE
 name: RID Manager$
-objectGUID: ${NEWGUID}
 systemFlags: 0x8c000000
 objectCategory: CN=RID-Manager,CN=Schema,CN=Configuration,${BASEDN}
 isCriticalSystemObject: TRUE
@@ -198,13 +127,10 @@ objectClass: top
 objectClass: container
 cn: DomainUpdates
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 showInAdvancedViewOnly: TRUE
 name: DomainUpdates
-objectGUID: ${NEWGUID}
 objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
 
 dn: CN=Windows2003Update,CN=DomainUpdates,CN=System,${BASEDN}
@@ -212,13 +138,10 @@ objectClass: top
 objectClass: container
 cn: Windows2003Update
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 showInAdvancedViewOnly: TRUE
 name: Windows2003Update
-objectGUID: ${NEWGUID}
 objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
 revision: 8
 
@@ -227,13 +150,10 @@ objectclass: top
 objectclass: infrastructureUpdate
 cn: Infrastructure
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 showInAdvancedViewOnly: TRUE
 name: Infrastructure
-objectGUID: ${NEWGUID}
 systemFlags: 0x8c000000
 objectCategory: CN=Infrastructure-Update,CN=Schema,CN=Configuration,${BASEDN}
 isCriticalSystemObject: TRUE
@@ -272,8 +192,6 @@ objectClass: user
 cn: Administrator
 description: Built-in account for administering the computer/domain
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 memberOf: CN=Group Policy Creator Owners,CN=Users,${BASEDN}
 memberOf: CN=Domain Admins,CN=Users,${BASEDN}
@@ -282,7 +200,6 @@ memberOf: CN=Schema Admins,CN=Users,${BASEDN}
 memberOf: CN=Administrators,CN=Builtin,${BASEDN}
 uSNChanged: 1
 name: Administrator
-objectGUID: ${NEWGUID}
 userAccountControl: 0x10200
 badPwdCount: 0
 codePage: 0
@@ -311,13 +228,10 @@ objectClass: user
 cn: Guest
 description: Built-in account for guest access to the computer/domain
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 memberOf: CN=Guests,CN=Builtin,${BASEDN}
 uSNChanged: 1
 name: Guest
-objectGUID: ${NEWGUID}
 userAccountControl: 0x10222
 badPwdCount: 0
 codePage: 0
@@ -344,12 +258,9 @@ member: CN=Domain Admins,CN=Users,${BASEDN}
 member: CN=Enterprise Admins,CN=Users,${BASEDN}
 member: CN=Administrator,CN=Users,${BASEDN}
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 name: Administrators
-objectGUID: ${NEWGUID}
 objectSid: S-1-5-32-544
 adminCount: 1
 sAMAccountName: Administrators
@@ -392,12 +303,9 @@ cn: Users
 description: Users are prevented from making accidental or intentional system-wide changes.  Thus, Users can run certified applications, but not most legacy applications
 member: CN=Domain Users,CN=Users,${BASEDN}
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 name: Users
-objectGUID: ${NEWGUID}
 objectSid: S-1-5-32-545
 sAMAccountName: Users
 sAMAccountType: 0x20000000
@@ -414,12 +322,9 @@ description: Guests have the same access as members of the Users group by defaul
 member: CN=Domain Guests,CN=Users,${BASEDN}
 member: CN=Guest,CN=Users,${BASEDN}
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 name: Guests
-objectGUID: ${NEWGUID}
 objectSid: S-1-5-32-546
 sAMAccountName: Guests
 sAMAccountType: 0x20000000
@@ -435,12 +340,9 @@ objectClass: group
 cn: Print Operators
 description: Members can administer domain printers
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 name: Print Operators
-objectGUID: ${NEWGUID}
 objectSid: S-1-5-32-550
 adminCount: 1
 sAMAccountName: Print Operators
@@ -459,12 +361,9 @@ objectClass: group
 cn: Backup Operators
 description: Backup Operators can override security restrictions for the sole purpose of backing up or restoring files
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 name: Backup Operators
-objectGUID: ${NEWGUID}
 objectSid: S-1-5-32-551
 adminCount: 1
 sAMAccountName: Backup Operators
@@ -484,12 +383,9 @@ objectClass: group
 cn: Replicator
 description: Supports file replication in a domain
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 name: Replicator
-objectGUID: ${NEWGUID}
 objectSid: S-1-5-32-552
 adminCount: 1
 sAMAccountName: Replicator
@@ -505,12 +401,9 @@ objectClass: group
 cn: Remote Desktop Users
 description: Members in this group are granted the right to logon remotely
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 name: Remote Desktop Users
-objectGUID: ${NEWGUID}
 objectSid: S-1-5-32-555
 sAMAccountName: Remote Desktop Users
 sAMAccountType: 0x20000000
@@ -525,12 +418,9 @@ objectClass: group
 cn: Network Configuration Operators
 description: Members in this group can have some administrative privileges to manage configuration of networking features
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 name: Network Configuration Operators
-objectGUID: ${NEWGUID}
 objectSid: S-1-5-32-556
 sAMAccountName: Network Configuration Operators
 sAMAccountType: 0x20000000
@@ -545,12 +435,9 @@ objectClass: group
 cn: Performance Monitor Users
 description: Members of this group have remote access to monitor this computer
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 name: Performance Monitor Users
-objectGUID: ${NEWGUID}
 objectSid: S-1-5-32-558
 sAMAccountName: Performance Monitor Users
 sAMAccountType: 0x20000000
@@ -565,12 +452,9 @@ objectClass: group
 cn: Performance Log Users
 description: Members of this group have remote access to schedule logging of performance counters on this computer
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 name: Performance Log Users
-objectGUID: ${NEWGUID}
 objectSid: S-1-5-32-559
 sAMAccountName: Performance Log Users
 sAMAccountType: 0x20000000
@@ -587,8 +471,6 @@ objectClass: user
 objectClass: computer
 cn: ${NETBIOSNAME}
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 name: ${NETBIOSNAME}
@@ -626,13 +508,10 @@ objectClass: user
 cn: krbtgt
 description: Key Distribution Center Service Account
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 showInAdvancedViewOnly: TRUE
 name: krbtgt
-objectGUID: ${NEWGUID}
 userAccountControl: 514
 badPwdCount: 0
 codePage: 0
@@ -659,12 +538,9 @@ objectClass: group
 cn: Domain Computers
 description: All workstations and servers joined to the domain
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 name: Domain Computers
-objectGUID: ${NEWGUID}
 objectSid: ${DOMAINSID}-515
 sAMAccountName: Domain Computers
 sAMAccountType: 0x10000000
@@ -678,12 +554,9 @@ objectClass: group
 cn: Domain Controllers
 description: All domain controllers in the domain
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 name: Domain Controllers
-objectGUID: ${NEWGUID}
 objectSid: ${DOMAINSID}-516
 adminCount: 1
 sAMAccountName: Domain Controllers
@@ -699,12 +572,9 @@ cn: Schema Admins
 description: Designated administrators of the schema
 member: CN=Administrator,CN=Users,${BASEDN}
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 name: Schema Admins
-objectGUID: ${NEWGUID}
 objectSid: ${DOMAINSID}-518
 adminCount: 1
 sAMAccountName: Schema Admins
@@ -721,13 +591,10 @@ cn: Enterprise Admins
 description: Designated administrators of the enterprise
 member: CN=Administrator,CN=Users,${BASEDN}
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 memberOf: CN=Administrators,CN=Builtin,${BASEDN}
 uSNChanged: 1
 name: Enterprise Admins
-objectGUID: ${NEWGUID}
 objectSid: ${DOMAINSID}-519
 adminCount: 1
 sAMAccountName: Enterprise Admins
@@ -743,12 +610,9 @@ objectClass: group
 cn: Cert Publishers
 description: Members of this group are permitted to publish certificates to the Active Directory
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 name: Cert Publishers
-objectGUID: ${NEWGUID}
 objectSid: ${DOMAINSID}-517
 sAMAccountName: Cert Publishers
 sAMAccountType: 0x20000000
@@ -763,13 +627,10 @@ cn: Domain Admins
 description: Designated administrators of the domain
 member: CN=Administrator,CN=Users,${BASEDN}
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 memberOf: CN=Administrators,CN=Builtin,${BASEDN}
 uSNChanged: 1
 name: Domain Admins
-objectGUID: ${NEWGUID}
 objectSid: ${DOMAINSID}-512
 adminCount: 1
 sAMAccountName: Domain Admins
@@ -785,13 +646,10 @@ objectClass: group
 cn: Domain Users
 description: All domain users
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 memberOf: CN=Users,CN=Builtin,${BASEDN}
 uSNChanged: 1
 name: Domain Users
-objectGUID: ${NEWGUID}
 objectSid: ${DOMAINSID}-513
 sAMAccountName: Domain Users
 sAMAccountType: 0x10000000
@@ -806,13 +664,10 @@ objectClass: group
 cn: Domain Guests
 description: All domain guests
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 memberOf: CN=Guests,CN=Builtin,${BASEDN}
 uSNChanged: 1
 name: Domain Guests
-objectGUID: ${NEWGUID}
 objectSid: ${DOMAINSID}-514
 sAMAccountName: Domain Guests
 sAMAccountType: 0x10000000
@@ -827,12 +682,9 @@ cn: Group Policy Creator Owners
 description: Members in this group can modify group policy for the domain
 member: CN=Administrator,CN=Users,${BASEDN}
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 name: Group Policy Creator Owners
-objectGUID: ${NEWGUID}
 objectSid: ${DOMAINSID}-520
 sAMAccountName: Group Policy Creator Owners
 sAMAccountType: 0x10000000
@@ -847,12 +699,9 @@ objectClass: group
 cn: RAS and IAS Servers
 description: Servers in this group can access remote access properties of users
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 name: RAS and IAS Servers
-objectGUID: ${NEWGUID}
 objectSid: ${DOMAINSID}-553
 sAMAccountName: RAS and IAS Servers
 sAMAccountType: 0x20000000
@@ -866,12 +715,9 @@ objectClass: group
 cn: Server Operators
 description: Members can administer domain servers
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 name: Server Operators
-objectGUID: ${NEWGUID}
 objectSid: S-1-5-32-549
 adminCount: 1
 sAMAccountName: Server Operators
@@ -893,12 +739,9 @@ objectClass: group
 cn: Account Operators
 description: Members can administer domain user and group accounts
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 name: Account Operators
-objectGUID: ${NEWGUID}
 objectSid: S-1-5-32-548
 adminCount: 1
 sAMAccountName: Account Operators
@@ -915,13 +758,10 @@ objectClass: container
 cn: Templates
 description: Container for SAM account templates
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: 1
 uSNChanged: 1
 showInAdvancedViewOnly: TRUE
 name: Templates
-objectGUID: ${NEWGUID}
 systemFlags: 0x8c000000
 objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
 isCriticalSystemObject: TRUE
@@ -1066,13 +906,10 @@ objectClass: top
 objectClass: configuration
 cn: Configuration
 instanceType: 13
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: ${USN}
 uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 name: Configuration
-objectGUID: ${NEWGUID}
 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}
@@ -1083,13 +920,10 @@ objectClass: top
 objectClass: crossRefContainer
 cn: Partitions
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: ${USN}
 uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 name: Partitions
-objectGUID: ${NEWGUID}
 systemFlags: 0x80000000
 objectCategory: CN=Cross-Ref-Container,CN=Schema,CN=Configuration,${BASEDN}
 msDS-Behavior-Version: 0
@@ -1100,13 +934,10 @@ objectClass: top
 objectClass: crossRef
 cn: Enterprise Configuration
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: ${USN}
 uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 name: Enterprise Configuration
-objectGUID: ${NEWGUID}
 systemFlags: 0x00000001
 objectCategory: CN=Cross-Ref,CN=Schema,CN=Configuration,${BASEDN}
 nCName: CN=Configuration,${BASEDN}
@@ -1117,13 +948,10 @@ objectClass: top
 objectClass: crossRef
 cn: Enterprise Schema
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: ${USN}
 uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 name: Enterprise Schema
-objectGUID: ${NEWGUID}
 systemFlags: 0x00000001
 objectCategory: CN=Cross-Ref,CN=Schema,CN=Configuration,${BASEDN}
 nCName: CN=Schema,CN=Configuration,${BASEDN}
@@ -1134,13 +962,10 @@ objectClass: top
 objectClass: crossRef
 cn: ${DOMAIN}
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: ${USN}
 uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 name: ${DOMAIN}
-objectGUID: ${NEWGUID}
 systemFlags: 0x00000003
 objectCategory: CN=Cross-Ref,CN=Schema,CN=Configuration,${BASEDN}
 nCName: ${BASEDN}
@@ -1152,13 +977,10 @@ objectClass: top
 objectClass: sitesContainer
 cn: Sites
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: ${USN}
 uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 name: Sites
-objectGUID: ${NEWGUID}
 systemFlags: 0x82000000
 objectCategory: CN=Sites-Container,CN=Schema,CN=Configuration,${BASEDN}
 
@@ -1167,13 +989,10 @@ objectClass: top
 objectClass: site
 cn: Sites
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: ${USN}
 uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 name: Sites
-objectGUID: ${NEWGUID}
 systemFlags: 0x82000000
 objectCategory: CN=Site,CN=Schema,CN=Configuration,${BASEDN}
 
@@ -1182,13 +1001,10 @@ objectClass: top
 objectClass: serversContainer
 cn: Servers
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: ${USN}
 uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 name: Servers
-objectGUID: ${NEWGUID}
 systemFlags: 0x82000000
 objectCategory: CN=Servers-Container,CN=Schema,CN=Configuration,${BASEDN}
 
@@ -1197,13 +1013,10 @@ objectClass: top
 objectClass: server
 cn: ${NETBIOSNAME}
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: ${USN}
 uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 name: ${NETBIOSNAME}
-objectGUID: ${NEWGUID}
 systemFlags: 0x52000000
 objectCategory: CN=Server,CN=Schema,CN=Configuration,${BASEDN}
 dNSHostName: ${DNSNAME}
@@ -1215,8 +1028,6 @@ objectClass: applicationSettings
 objectClass: nTDSDSA
 cn: NTDS Settings
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: ${USN}
 uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
@@ -1233,43 +1044,34 @@ objectClass: top
 objectClass: container
 cn: Services
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: ${USN}
 uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 name: Services
 systemFlags: 0x80000000
 objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
-objectGUID: ${NEWGUID}
 
 dn: CN=Windows NT,CN=Services,CN=Configuration,${BASEDN}
 objectClass: top
 objectClass: container
 cn: Windows NT
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: ${USN}
 uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 name: Windows NT
 objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
-objectGUID: ${NEWGUID}
 
 dn: CN=Directory Service,CN=Windows NT,CN=Services,CN=Configuration,${BASEDN}
 objectClass: top
 objectClass: nTDSService
 cn: Directory Service
 instanceType: 4
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: ${USN}
 uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 name: Directory Service
 objectCategory: CN=NTDS-Service,CN=Schema,CN=Configuration,${BASEDN}
-objectGUID: ${NEWGUID}
 sPNMappings: host=ldap,dns,cifs
 
 
@@ -1281,13 +1083,10 @@ objectClass: top
 objectClass: dMD
 cn: Schema
 instanceType: 13
-whenCreated: ${LDAPTIME}
-whenChanged: ${LDAPTIME}
 uSNCreated: ${USN}
 uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 name: Schema
-objectGUID: ${NEWGUID}
 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}
diff --git a/source4/setup/provision_init.ldif b/source4/setup/provision_init.ldif
new file mode 100644
index 0000000000..cbe561eee9
--- /dev/null
+++ b/source4/setup/provision_init.ldif
@@ -0,0 +1,51 @@
+dn: @INDEXLIST
+@IDXATTR: name
+@IDXATTR: sAMAccountName
+@IDXATTR: objectSid
+@IDXATTR: objectClass
+@IDXATTR: member
+@IDXATTR: unixID
+@IDXATTR: unixName
+@IDXATTR: privilege
+
+dn: @ATTRIBUTES
+userPrincipalName: CASE_INSENSITIVE
+servicePrincipalName: CASE_INSENSITIVE
+dnsDomain: CASE_INSENSITIVE
+dnsRoot: CASE_INSENSITIVE
+nETBIOSName: CASE_INSENSITIVE
+cn: CASE_INSENSITIVE
+dc: CASE_INSENSITIVE
+name: CASE_INSENSITIVE
+dn: CASE_INSENSITIVE
+sAMAccountName: CASE_INSENSITIVE
+objectClass: CASE_INSENSITIVE
+unicodePwd: HIDDEN
+ntPwdHash: HIDDEN
+ntPwdHistory: HIDDEN
+lmPwdHash: HIDDEN
+lmPwdHistory: HIDDEN
+createTimestamp: HIDDEN
+modifyTimestamp: HIDDEN
+groupType: INTEGER
+sAMAccountType: INTEGER
+systemFlags: INTEGER
+userAccountControl: INTEGER
+
+dn: @SUBCLASSES
+top: domain
+top: person
+top: group
+domain: domainDNS
+domain: builtinDomain
+person: organizationalPerson
+organizationalPerson: user
+user: computer
+template: userTemplate
+template: groupTemplate
+
+#Add modules to the list to activate them by default
+#beware often order is important
+dn: @MODULES
+@LIST: samldb,timestamps,objectguid
+