r14200: Now we have real USN support, don't force the values in the provision

scripts.

This tests the real module, and avoids duplication.

Andrew Bartlett
(This used to be commit 0859ba59ae00029177cd63366fc59efe8b19c973)

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 84ed69231b0e258a4ec418fd43658a701dc19dba..b01fec82c74468daf04f6164b54ef345f2d5a406 100644 (file)
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -4,9 +4,6 @@
        Released under the GNU GPL v2 or later
 */
 
-/* used to generate sequence numbers for records */
-provision_next_usn = 1;
-
 sys = sys_init();
 
 /*
@@ -59,8 +56,6 @@ dn: CN=%s,CN=ForeignSecurityPrincipals,%s
 objectClass: top
 objectClass: foreignSecurityPrincipal
 description: %s
-uSNCreated: 1
-uSNChanged: 1
 ",
                          sid, subobj.BASEDN, desc);
        /* deliberately ignore errors from this, as the records may
@@ -132,14 +127,6 @@ function hostip()
        return list[0];
 }
 
-/*
-  return next USN in the sequence
-*/
-function nextusn()
-{
-       provision_next_usn = provision_next_usn+1;
-       return provision_next_usn;
-}
 
 /*
   return first part of hostname
@@ -358,8 +345,6 @@ function provision(subobj, message, blank, paths, session_info, credentials)
        var rdns = split(",", subobj.BASEDN);
        subobj.RDN_DC = substr(rdns[0], strlen("DC="));
 
-       provision_next_usn = 1;
-
        info.subobj = subobj;
        info.message = message;
        info.credentials = credentials;
@@ -465,7 +450,6 @@ function provision_guess()
        subobj.NTTIME       = nttime;
        subobj.LDAPTIME     = ldaptime;
        subobj.DATESTRING   = datestring;
-       subobj.USN          = nextusn;
        subobj.ROOT         = findnss(nss.getpwnam, "root");
        subobj.NOBODY       = findnss(nss.getpwnam, "nobody");
        subobj.NOGROUP      = findnss(nss.getgrnam, "nogroup", "nobody");

diff --git a/source4/setup/provision.ldif b/source4/setup/provision.ldif
index d87938910c9e56570abbdb6c5b361dda36501370..ee62115435e6317b7a6f388db56a5c82c19a28ce 100644 (file)
--- a/source4/setup/provision.ldif
+++ b/source4/setup/provision.ldif
@@ -13,8 +13,6 @@ forceLogoff: 0x8000000000000000
 lockoutDuration: -18000000000
 lockOutObservationWindow: -18000000000
 lockoutThreshold: 0
-uSNCreated: 1
-uSNChanged: 1
 maxPwdAge: -37108517437440
 minPwdAge: 0
 minPwdLength: 7
@@ -41,8 +39,6 @@ objectClass: container
 cn: Users
 description: Default container for upgraded user accounts
 instanceType: 4
-uSNCreated: 1
-uSNChanged: 1
 showInAdvancedViewOnly: FALSE
 systemFlags: 0x8c000000
 objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
@@ -56,8 +52,6 @@ objectClass: container
 cn: Computers
 description: Default container for upgraded computer accounts
 instanceType: 4
-uSNCreated: 1
-uSNChanged: 1
 showInAdvancedViewOnly: FALSE
 systemFlags: 0x8c000000
 objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
@@ -69,8 +63,6 @@ objectClass: organizationalUnit
 ou: Domain Controllers
 description: Default container for domain controllers
 instanceType: 4
-uSNCreated: 1
-uSNChanged: 1
 showInAdvancedViewOnly: FALSE
 systemFlags: 0x8c000000
 objectCategory: CN=Organizational-Unit,CN=Schema,CN=Configuration,${BASEDN}
@@ -82,8 +74,6 @@ objectClass: container
 cn: ForeignSecurityPrincipals
 description: Default container for security identifiers (SIDs) associated with objects from external, trusted domains
 instanceType: 4
-uSNCreated: 1
-uSNChanged: 1
 showInAdvancedViewOnly: FALSE
 systemFlags: 0x8c000000
 objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
@@ -95,8 +85,6 @@ objectClass: container
 cn: System
 description: Builtin system settings
 instanceType: 4
-uSNCreated: 1
-uSNChanged: 1
 showInAdvancedViewOnly: TRUE
 systemFlags: 0x8c000000
 objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
@@ -107,8 +95,6 @@ objectclass: top
 objectclass: rIDManager
 cn: RID Manager$
 instanceType: 4
-uSNCreated: 1
-uSNChanged: 1
 showInAdvancedViewOnly: TRUE
 systemFlags: 0x8c000000
 objectCategory: CN=RID-Manager,CN=Schema,CN=Configuration,${BASEDN}
@@ -121,8 +107,6 @@ objectClass: top
 objectClass: container
 cn: DomainUpdates
 instanceType: 4
-uSNCreated: 1
-uSNChanged: 1
 showInAdvancedViewOnly: TRUE
 objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
 
@@ -131,8 +115,6 @@ objectClass: top
 objectClass: container
 cn: Windows2003Update
 instanceType: 4
-uSNCreated: 1
-uSNChanged: 1
 showInAdvancedViewOnly: TRUE
 objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
 revision: 8
@@ -142,8 +124,6 @@ objectclass: top
 objectclass: infrastructureUpdate
 cn: Infrastructure
 instanceType: 4
-uSNCreated: 1
-uSNChanged: 1
 showInAdvancedViewOnly: TRUE
 systemFlags: 0x8c000000
 objectCategory: CN=Infrastructure-Update,CN=Schema,CN=Configuration,${BASEDN}
@@ -182,8 +162,6 @@ objectClass: top
 objectClass: configuration
 cn: Configuration
 instanceType: 13
-uSNCreated: ${USN}
-uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 objectCategory: CN=Configuration,CN=Schema,CN=Configuration,${BASEDN}
 subRefs: CN=Schema,CN=Configuration,${BASEDN}
@@ -195,8 +173,6 @@ objectClass: top
 objectClass: crossRefContainer
 cn: Partitions
 instanceType: 4
-uSNCreated: ${USN}
-uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 systemFlags: 0x80000000
 objectCategory: CN=Cross-Ref-Container,CN=Schema,CN=Configuration,${BASEDN}
@@ -208,8 +184,6 @@ objectClass: top
 objectClass: crossRef
 cn: Enterprise Configuration
 instanceType: 4
-uSNCreated: ${USN}
-uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 systemFlags: 0x00000001
 objectCategory: CN=Cross-Ref,CN=Schema,CN=Configuration,${BASEDN}
@@ -221,8 +195,6 @@ objectClass: top
 objectClass: crossRef
 cn: Enterprise Schema
 instanceType: 4
-uSNCreated: ${USN}
-uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 systemFlags: 0x00000001
 objectCategory: CN=Cross-Ref,CN=Schema,CN=Configuration,${BASEDN}
@@ -234,8 +206,6 @@ objectClass: top
 objectClass: crossRef
 cn: ${DOMAIN}
 instanceType: 4
-uSNCreated: ${USN}
-uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 systemFlags: 0x00000003
 objectCategory: CN=Cross-Ref,CN=Schema,CN=Configuration,${BASEDN}
@@ -248,8 +218,6 @@ objectClass: top
 objectClass: sitesContainer
 cn: Sites
 instanceType: 4
-uSNCreated: ${USN}
-uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 systemFlags: 0x82000000
 objectCategory: CN=Sites-Container,CN=Schema,CN=Configuration,${BASEDN}
@@ -259,8 +227,6 @@ objectClass: top
 objectClass: site
 cn: ${DEFAULTSITE}
 instanceType: 4
-uSNCreated: ${USN}
-uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 systemFlags: 0x82000000
 objectCategory: CN=Site,CN=Schema,CN=Configuration,${BASEDN}
@@ -270,8 +236,6 @@ objectClass: top
 objectClass: serversContainer
 cn: Servers
 instanceType: 4
-uSNCreated: ${USN}
-uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 systemFlags: 0x82000000
 objectCategory: CN=Servers-Container,CN=Schema,CN=Configuration,${BASEDN}
@@ -281,8 +245,6 @@ objectClass: top
 objectClass: server
 cn: ${NETBIOSNAME}
 instanceType: 4
-uSNCreated: ${USN}
-uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 systemFlags: 0x52000000
 objectCategory: CN=Server,CN=Schema,CN=Configuration,${BASEDN}
@@ -295,8 +257,6 @@ objectClass: applicationSettings
 objectClass: nTDSDSA
 cn: NTDS Settings
 instanceType: 4
-uSNCreated: ${USN}
-uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 systemFlags: 0x02000000
 objectCategory: CN=NTDS-DSA,CN=Schema,CN=Configuration,${BASEDN}
@@ -310,8 +270,6 @@ objectClass: top
 objectClass: container
 cn: Services
 instanceType: 4
-uSNCreated: ${USN}
-uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 systemFlags: 0x80000000
 objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
@@ -321,8 +279,6 @@ objectClass: top
 objectClass: container
 cn: Windows NT
 instanceType: 4
-uSNCreated: ${USN}
-uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
 
@@ -331,8 +287,6 @@ objectClass: top
 objectClass: nTDSService
 cn: Directory Service
 instanceType: 4
-uSNCreated: ${USN}
-uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 objectCategory: CN=NTDS-Service,CN=Schema,CN=Configuration,${BASEDN}
 sPNMappings: host=ldap,dns,cifs,http
@@ -342,8 +296,6 @@ objectClass: top
 objectClass: container
 cn: Query-Policies
 instanceType: 4
-uSNCreated: ${USN}
-uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}
 
@@ -352,8 +304,6 @@ objectClass: top
 objectClass: queryPolicy
 cn: Default Query Policy
 instanceType: 4
-uSNCreated: ${USN}
-uSNChanged: ${USN}
 showInAdvancedViewOnly: TRUE
 objectCategory: CN=Query-Policy,CN=Schema,CN=Configuration,${BASEDN}
 lDAPAdminLimits: MaxValRange=1500
@@ -379,8 +329,6 @@ objectClass: top
 objectClass: dMD
 cn: Schema
 instanceType: 13
-uSNCreated: ${USN}
-uSNChanged: ${USN}
 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}

diff --git a/source4/setup/provision_templates.ldif b/source4/setup/provision_templates.ldif
index 7b0fe1994c7b87dc8fb454453342017952ec276b..9aa94c9d8c0f075e6ad2540441edee3e5a4a80db 100644 (file)
--- a/source4/setup/provision_templates.ldif
+++ b/source4/setup/provision_templates.ldif
@@ -4,8 +4,6 @@ objectClass: container
 cn: Templates
 description: Container for SAM account templates
 instanceType: 4
-uSNCreated: 1
-uSNChanged: 1
 showInAdvancedViewOnly: TRUE
 systemFlags: 0x8c000000
 objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN}

diff --git a/source4/setup/provision_users.ldif b/source4/setup/provision_users.ldif
index 45b2382c17be7e88c2a310d036c6887e0acfb68a..652c0b64945ff02e0f666b0d107b10084a64859d 100644 (file)
--- a/source4/setup/provision_users.ldif
+++ b/source4/setup/provision_users.ldif
@@ -2,13 +2,11 @@ dn: CN=Administrator,CN=Users,${BASEDN}
 objectClass: user
 cn: Administrator
 description: Built-in account for administering the computer/domain
-uSNCreated: 1
 memberOf: CN=Group Policy Creator Owners,CN=Users,${BASEDN}
 memberOf: CN=Domain Admins,CN=Users,${BASEDN}
 memberOf: CN=Enterprise Admins,CN=Users,${BASEDN}
 memberOf: CN=Schema Admins,CN=Users,${BASEDN}
 memberOf: CN=Administrators,CN=Builtin,${BASEDN}
-uSNChanged: 1
 userAccountControl: 0x10200
 objectSid: ${DOMAINSID}-500
 adminCount: 1
@@ -21,9 +19,7 @@ dn: CN=Guest,CN=Users,${BASEDN}
 objectClass: user
 cn: Guest
 description: Built-in account for guest access to the computer/domain
-uSNCreated: 1
 memberOf: CN=Guests,CN=Builtin,${BASEDN}
-uSNChanged: 1
 userAccountControl: 0x10222
 primaryGroupID: 514
 objectSid: ${DOMAINSID}-501
@@ -38,8 +34,6 @@ description: Administrators have complete and unrestricted access to the compute
 member: CN=Domain Admins,CN=Users,${BASEDN}
 member: CN=Enterprise Admins,CN=Users,${BASEDN}
 member: CN=Administrator,CN=Users,${BASEDN}
-uSNCreated: 1
-uSNChanged: 1
 objectSid: S-1-5-32-544
 adminCount: 1
 sAMAccountName: Administrators
@@ -77,8 +71,6 @@ privilege: SeRemoteInteractiveLogonRight
 dn: CN=${NETBIOSNAME},OU=Domain Controllers,${BASEDN}
 objectClass: computer
 cn: ${NETBIOSNAME}
-uSNCreated: 1
-uSNChanged: 1
 objectGUID: ${HOSTGUID}
 userAccountControl: 532480
 localPolicyFlags: 0
@@ -105,8 +97,6 @@ objectClass: group
 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}
-uSNCreated: 1
-uSNChanged: 1
 objectSid: S-1-5-32-545
 sAMAccountName: Users
 sAMAccountType: 0x20000000
@@ -122,8 +112,6 @@ cn: Guests
 description: Guests have the same access as members of the Users group by default, except for the Guest account which is further restricted
 member: CN=Domain Guests,CN=Users,${BASEDN}
 member: CN=Guest,CN=Users,${BASEDN}
-uSNCreated: 1
-uSNChanged: 1
 objectSid: S-1-5-32-546
 sAMAccountName: Guests
 sAMAccountType: 0x20000000
@@ -137,8 +125,6 @@ objectClass: top
 objectClass: group
 cn: Print Operators
 description: Members can administer domain printers
-uSNCreated: 1
-uSNChanged: 1
 objectSid: S-1-5-32-550
 adminCount: 1
 sAMAccountName: Print Operators
@@ -156,8 +142,6 @@ objectClass: top
 objectClass: group
 cn: Backup Operators
 description: Backup Operators can override security restrictions for the sole purpose of backing up or restoring files
-uSNCreated: 1
-uSNChanged: 1
 objectSid: S-1-5-32-551
 adminCount: 1
 sAMAccountName: Backup Operators
@@ -176,8 +160,6 @@ objectClass: top
 objectClass: group
 cn: Replicator
 description: Supports file replication in a domain
-uSNCreated: 1
-uSNChanged: 1
 objectSid: S-1-5-32-552
 adminCount: 1
 sAMAccountName: Replicator
@@ -192,8 +174,6 @@ objectClass: top
 objectClass: group
 cn: Remote Desktop Users
 description: Members in this group are granted the right to logon remotely
-uSNCreated: 1
-uSNChanged: 1
 objectSid: S-1-5-32-555
 sAMAccountName: Remote Desktop Users
 sAMAccountType: 0x20000000
@@ -207,8 +187,6 @@ objectClass: top
 objectClass: group
 cn: Network Configuration Operators
 description: Members in this group can have some administrative privileges to manage configuration of networking features
-uSNCreated: 1
-uSNChanged: 1
 objectSid: S-1-5-32-556
 sAMAccountName: Network Configuration Operators
 sAMAccountType: 0x20000000
@@ -222,8 +200,6 @@ objectClass: top
 objectClass: group
 cn: Performance Monitor Users
 description: Members of this group have remote access to monitor this computer
-uSNCreated: 1
-uSNChanged: 1
 objectSid: S-1-5-32-558
 sAMAccountName: Performance Monitor Users
 sAMAccountType: 0x20000000
@@ -237,8 +213,6 @@ objectClass: top
 objectClass: group
 cn: Performance Log Users
 description: Members of this group have remote access to schedule logging of performance counters on this computer
-uSNCreated: 1
-uSNChanged: 1
 objectSid: S-1-5-32-559
 sAMAccountName: Performance Log Users
 sAMAccountType: 0x20000000
@@ -254,8 +228,6 @@ objectClass: organizationalPerson
 objectClass: user
 cn: krbtgt
 description: Key Distribution Center Service Account
-uSNCreated: 1
-uSNChanged: 1
 showInAdvancedViewOnly: TRUE
 userAccountControl: 514
 objectSid: ${DOMAINSID}-502
@@ -272,8 +244,6 @@ objectClass: top
 objectClass: group
 cn: Domain Computers
 description: All workstations and servers joined to the domain
-uSNCreated: 1
-uSNChanged: 1
 objectSid: ${DOMAINSID}-515
 sAMAccountName: Domain Computers
 objectCategory: CN=Group,CN=Schema,CN=Configuration,${BASEDN}
@@ -284,8 +254,6 @@ objectClass: top
 objectClass: group
 cn: Domain Controllers
 description: All domain controllers in the domain
-uSNCreated: 1
-uSNChanged: 1
 objectSid: ${DOMAINSID}-516
 adminCount: 1
 sAMAccountName: Domain Controllers
@@ -297,8 +265,6 @@ objectClass: group
 cn: Schema Admins
 description: Designated administrators of the schema
 member: CN=Administrator,CN=Users,${BASEDN}
-uSNCreated: 1
-uSNChanged: 1
 objectSid: ${DOMAINSID}-518
 adminCount: 1
 sAMAccountName: Schema Admins
@@ -310,9 +276,7 @@ objectClass: group
 cn: Enterprise Admins
 description: Designated administrators of the enterprise
 member: CN=Administrator,CN=Users,${BASEDN}
-uSNCreated: 1
 memberOf: CN=Administrators,CN=Builtin,${BASEDN}
-uSNChanged: 1
 objectSid: ${DOMAINSID}-519
 adminCount: 1
 sAMAccountName: Enterprise Admins
@@ -323,8 +287,6 @@ objectClass: top
 objectClass: group
 cn: Cert Publishers
 description: Members of this group are permitted to publish certificates to the Active Directory
-uSNCreated: 1
-uSNChanged: 1
 groupType: 0x80000004
 sAMAccountType: 0x20000000
 objectSid: ${DOMAINSID}-517
@@ -338,9 +300,7 @@ objectClass: group
 cn: Domain Admins
 description: Designated administrators of the domain
 member: CN=Administrator,CN=Users,${BASEDN}
-uSNCreated: 1
 memberOf: CN=Administrators,CN=Builtin,${BASEDN}
-uSNChanged: 1
 objectSid: ${DOMAINSID}-512
 adminCount: 1
 sAMAccountName: Domain Admins
@@ -351,9 +311,7 @@ objectClass: top
 objectClass: group
 cn: Domain Users
 description: All domain users
-uSNCreated: 1
 memberOf: CN=Users,CN=Builtin,${BASEDN}
-uSNChanged: 1
 objectSid: ${DOMAINSID}-513
 sAMAccountName: Domain Users
 isCriticalSystemObject: TRUE
@@ -363,9 +321,7 @@ objectClass: top
 objectClass: group
 cn: Domain Guests
 description: All domain guests
-uSNCreated: 1
 memberOf: CN=Guests,CN=Builtin,${BASEDN}
-uSNChanged: 1
 objectSid: ${DOMAINSID}-514
 sAMAccountName: Domain Guests
 isCriticalSystemObject: TRUE
@@ -376,8 +332,6 @@ objectClass: group
 cn: Group Policy Creator Owners
 description: Members in this group can modify group policy for the domain
 member: CN=Administrator,CN=Users,${BASEDN}
-uSNCreated: 1
-uSNChanged: 1
 objectSid: ${DOMAINSID}-520
 sAMAccountName: Group Policy Creator Owners
 objectCategory: CN=Group,CN=Schema,CN=Configuration,${BASEDN}
@@ -389,8 +343,6 @@ objectClass: group
 cn: RAS and IAS Servers
 description: Servers in this group can access remote access properties of users
 instanceType: 4
-uSNCreated: 1
-uSNChanged: 1
 objectSid: ${DOMAINSID}-553
 sAMAccountName: RAS and IAS Servers
 sAMAccountType: 0x20000000
@@ -404,8 +356,6 @@ objectClass: group
 cn: Server Operators
 description: Members can administer domain servers
 instanceType: 4
-uSNCreated: 1
-uSNChanged: 1
 objectSid: S-1-5-32-549
 adminCount: 1
 sAMAccountName: Server Operators
@@ -427,8 +377,6 @@ objectClass: group
 cn: Account Operators
 description: Members can administer domain user and group accounts
 instanceType: 4
-uSNCreated: 1
-uSNChanged: 1
 objectSid: S-1-5-32-548
 adminCount: 1
 sAMAccountName: Account Operators