5 files changed, 6 insertions, 5 deletions
diff --git a/confskel/openldap/ldif/config.ldif b/confskel/openldap/ldif/config.ldif
index 1d3b2d6..901e58f 100644
--- a/confskel/openldap/ldif/config.ldif
+++ b/confskel/openldap/ldif/config.ldif
@@ -39,7 +39,7 @@ olcWriteTimeout: 0
 structuralObjectClass: olcGlobal
 creatorsName: cn=config
 createTimestamp: @@@TIMESTAMP@@@Z
-entryCSN: @@@TIMESTAMP@@@.000000Z#000000#000#000000
+entryCSN: @@@TIMESTAMP@@@.@@@TIMESTAMP_MICROSECONDS@@@Z#000000#000#000000
 entryUUID: @@@ENTRYUUID@@@
 modifiersName: cn=config
 modifyTimestamp: @@@TIMESTAMP@@@Z
diff --git a/confskel/openldap/ldif/moduleConfig.ldif b/confskel/openldap/ldif/moduleConfig.ldif
index 880cb21..1e65f27 100644
--- a/confskel/openldap/ldif/moduleConfig.ldif
+++ b/confskel/openldap/ldif/moduleConfig.ldif
@@ -11,7 +11,7 @@ olcModuleLoad: {5}ppolicy
 structuralObjectClass: olcModuleList
 creatorsName: cn=config
 createTimestamp: @@@TIMESTAMP@@@Z
-entryCSN: @@@TIMESTAMP@@@.000000Z#000000#000#000000
+entryCSN: @@@TIMESTAMP@@@.@@@TIMESTAMP_MICROSECONDS@@@Z#000000#000#000000
 entryUUID: @@@ENTRYUUID@@@
 modifiersName: cn=config
 modifyTimestamp: @@@TIMESTAMP@@@Z
diff --git a/confskel/openldap/ldif/olcConfig.ldif b/confskel/openldap/ldif/olcConfig.ldif
index 7b468e7..72ae6a7 100644
--- a/confskel/openldap/ldif/olcConfig.ldif
+++ b/confskel/openldap/ldif/olcConfig.ldif
@@ -19,7 +19,7 @@ olcMonitoring: FALSE
 structuralObjectClass: olcDatabaseConfig
 creatorsName: cn=config
 createTimestamp: @@@TIMESTAMP@@@Z
-entryCSN: @@@TIMESTAMP@@@.000000Z#000000#000#000000
+entryCSN: @@@TIMESTAMP@@@.@@@TIMESTAMP_MICROSECONDS@@@Z#000000#000#000000
 entryUUID: @@@ENTRYUUID@@@
 modifiersName: cn=config
 modifyTimestamp: @@@TIMESTAMP@@@Z
diff --git a/confskel/openldap/ldif/olcDatabase.ldif b/confskel/openldap/ldif/olcDatabase.ldif
index 7149c8d..d960379 100644
--- a/confskel/openldap/ldif/olcDatabase.ldif
+++ b/confskel/openldap/ldif/olcDatabase.ldif
@@ -33,6 +33,7 @@ olcDbConfig: {2}set_lg_bsize 2097152
 olcDbNoSync: FALSE
 olcDbDirtyRead: FALSE
 olcDbIDLcacheSize: 0
+olcDbIndex: entryCSN eq
 olcDbIndex: objectClass eq
 olcDbIndex: krb5PrincipalName eq,pres
 olcDbIndex: cn eq,pres,subinitial
@@ -50,7 +51,7 @@ olcPlugin: postoperation @@@TDELIBDIR@@@/slapi-acl-manager.so plugin_init adming
 structuralObjectClass: olcHdbConfig
 creatorsName: cn=config
 createTimestamp: @@@TIMESTAMP@@@Z
-entryCSN: @@@TIMESTAMP@@@.000000Z#000000#000#000000
+entryCSN: @@@TIMESTAMP@@@.@@@TIMESTAMP_MICROSECONDS@@@Z#000000#000#000000
 entryUUID: @@@ENTRYUUID@@@
 modifiersName: cn=config
 modifyTimestamp: @@@TIMESTAMP@@@Z
diff --git a/confskel/openldap/ldif/schema.ldif b/confskel/openldap/ldif/schema.ldif
index b8a7529..5cd57e4 100644
--- a/confskel/openldap/ldif/schema.ldif
+++ b/confskel/openldap/ldif/schema.ldif
@@ -807,6 +807,6 @@ olcLdapSyntaxes: ( 1.3.6.1.4.1.4203.666.2.1 DESC 'OpenLDAP Experimental ACI' )
 structuralObjectClass: olcSchemaConfig
 creatorsName: cn=config
 createTimestamp: @@@TIMESTAMP@@@Z
-entryCSN: @@@TIMESTAMP@@@.000000Z#000000#000#000000
+entryCSN: @@@TIMESTAMP@@@.@@@TIMESTAMP_MICROSECONDS@@@Z#000000#000#000000
 modifiersName: cn=config
 modifyTimestamp: @@@TIMESTAMP@@@Z