summaryrefslogtreecommitdiff
path: root/source4/setup
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-08-14 00:59:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:15:33 -0500
commit8f42f1292c2f1f1002b8446dc8b5351eb633d5ce (patch)
tree93ea15acce51657b8dd95bdc429b450db63313b5 /source4/setup
parent027583e6de2a6981d1c0e8959e1e37bf758be8f9 (diff)
downloadsamba-8f42f1292c2f1f1002b8446dc8b5351eb633d5ce.tar.gz
samba-8f42f1292c2f1f1002b8446dc8b5351eb633d5ce.tar.bz2
samba-8f42f1292c2f1f1002b8446dc8b5351eb633d5ce.zip
r17526: Move timestamp generation into the objectGUID module. It probably
needs to be renamed (operation_add?). This allows me to match the behaviour and substitute with the entryUUID module for remote LDAP connections. Andrew Bartlett (This used to be commit af02b4d7c631bb15bf5a5f73f9fdc23075d50f60)
Diffstat (limited to 'source4/setup')
-rwxr-xr-xsource4/setup/provision6
-rw-r--r--source4/setup/provision_partitions.ldif5
2 files changed, 10 insertions, 1 deletions
diff --git a/source4/setup/provision b/source4/setup/provision
index a58f4a5dce..4d4716ee1a 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -111,6 +111,12 @@ for (r in options) {
subobj[key] = options[r];
}
+if (options["ldap-backend"] != undefined) {
+ subobj["LDAPMODULES"] = "entryUUID";
+} else {
+ subobj["LDAPMODULES"] = "objectguid";
+}
+
var blank = (options["blank"] != undefined);
var ldapbase = (options["ldap-base"] != undefined);
diff --git a/source4/setup/provision_partitions.ldif b/source4/setup/provision_partitions.ldif
index 14e077eca1..e9a273795a 100644
--- a/source4/setup/provision_partitions.ldif
+++ b/source4/setup/provision_partitions.ldif
@@ -5,6 +5,9 @@ partition: ${BASEDN}:${LDAPBACKEND}
replicateEntries: @SUBCLASSES
replicateEntries: @ATTRIBUTES
replicateEntries: @INDEXLIST
+modules:CN=Schema,CN=Configuration,${BASEDN}:objectguid
+modules:CN=Configuration,${BASEDN}:objectguid
+modules:${BASEDN}:${LDAPMODULES}
#Add modules to the list to activate them by default
#beware often order is important
@@ -15,4 +18,4 @@ replicateEntries: @INDEXLIST
# - partition must be last
dn: @MODULES
-@LIST: rootdse,kludge_acl,paged_results,server_sort,extended_dn,asq,samldb,objectguid,password_hash,operational,objectclass,rdn_name,partition
+@LIST: rootdse,kludge_acl,paged_results,server_sort,extended_dn,asq,samldb,password_hash,operational,objectclass,rdn_name,partition