[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-958-gb1d2584

[Andrew Bartlett]

The branch, v4-0-test has been updated
       via  b1d2584277304be3f2a640465cbf6b2a3ec571cc (commit)
      from  5cd3310b78a85243eb436d05db3228c3495f9162 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit b1d2584277304be3f2a640465cbf6b2a3ec571cc
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Feb 21 10:43:13 2008 +1100

    Be consistant about --ldap-backend-type
    
    Make the EJS provision and the selftest scripts both use the new
    syntax for speicifying the ldap backend type.
    
    Andrew Bartlett

-----------------------------------------------------------------------

Summary of changes:
 source/selftest/target/Samba4.pm |    3 ++-
 source/setup/provision           |   16 ++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/selftest/target/Samba4.pm b/source/selftest/target/Samba4.pm
index 563aca8..11d4c85 100644
--- a/source/selftest/target/Samba4.pm
+++ b/source/selftest/target/Samba4.pm
@@ -729,9 +729,10 @@ nogroup:x:65534:nobody
 
 	        if ($self->{ldap} eq "openldap") {
 		       ($ret->{SLAPD_CONF}, $ret->{OPENLDAP_PIDFILE}) = $self->mk_openldap($ldapdir, $configuration) or die("Unable to create openldap directories");
+		       push (@provision_options, "--ldap-backend-type=openldap");
 	        } elsif ($self->{ldap} eq "fedora-ds") {
 		       ($ret->{FEDORA_DS_DIR}, $ret->{FEDORA_DS_PIDFILE}) = $self->mk_fedora_ds($ldapdir, $configuration) or die("Unable to create fedora ds directories");
-		       push (@provision_options, "--ldap-module=nsuniqueid");
+		       push (@provision_options, "--ldap-backend-type=fedora-ds");
 		       push (@provision_options, "'--aci=aci:: KHRhcmdldGF0dHIgPSAiKiIpICh2ZXJzaW9uIDMuMDthY2wgImZ1bGwgYWNjZXNzIHRvIGFsbCBieSBhbGwiO2FsbG93IChhbGwpKHVzZXJkbiA9ICJsZGFwOi8vL2FueW9uZSIpOykK'");
                  }
 
diff --git a/source/setup/provision b/source/setup/provision
index 9e135cd..328754f 100755
--- a/source/setup/provision
+++ b/source/setup/provision
@@ -35,7 +35,7 @@ options = GetOptions(ARGV,
 		'partitions-only',
 		'ldap-base',
 		'ldap-backend=s',
-                'ldap-module=s',
+                'ldap-backend-type=s',
                 'aci=s');
 
 if (options == undefined) {
@@ -88,7 +88,7 @@ provision [options]
  --partitions-only              Configure Samba's partitions, but do not modify them (ie, join a BDC)
  --ldap-base			output only an LDIF file, suitable for creating an LDAP baseDN
  --ldap-backend LDAPSERVER      LDAP server to use for this provision
- --ldap-module  MODULE          LDB mapping module to use for the LDAP backend
+ --ldap-backend-type  TYPE      OpenLDAP or Fedora DS
  --aci          ACI             An arbitary LDIF fragment, particularly useful to loading a backend ACI value into a target LDAP server
 You must provide at least a realm and domain
 
@@ -124,7 +124,7 @@ for (r in options) {
 
 var blank = (options["blank"] != undefined);
 var ldapbackend = (options["ldap-backend"] != undefined);
-var ldapmodule = (options["ldap-module"] != undefined);
+var ldapbackendtype = options["ldap-backend-type"];
 var partitions_only = (options["partitions-only"] != undefined);
 var paths = provision_default_paths(subobj);
 if (options["aci"] != undefined) {
@@ -139,9 +139,13 @@ if (ldapbackend) {
 	if (options["ldap-backend"] == "ldapi") {
 		subobj.LDAPBACKEND = subobj.LDAPI_URI;
 	}
-	if (!ldapmodule) {
+	if (ldapbackendtype == undefined) {
+	       
+	} else if (ldapbackendtype == "openldap") {
 		subobj.LDAPMODULE = "normalise,entryuuid";
 		subobj.TDB_MODULES_LIST = "";
+	} else if (ldapbackendtype == "fedora-ds") {
+		subobj.LDAPMODULE = "nsuniqueid";
 	}
 	subobj.BACKEND_MOD = subobj.LDAPMODULE + ",paged_searches";
 	subobj.DOMAINDN_LDB = subobj.LDAPBACKEND;
@@ -183,8 +187,8 @@ if (partitions_only) {
 	if (ldapbackend) {
 		message("--ldap-backend='%s' \\\n", subobj.LDAPBACKEND);
 	}
-	if (ldapmodule) {
-		message("--ldap-module='%s' \\\n", + subobj.LDAPMODULE);
+	if (ldapbackendtype != undefined) {
+		message("--ldap-backend-type='%s' \\\n", + ldapbackendtype);
 	}
 	message("--aci='" + subobj.ACI + "' \\\n")
 }


-- 
Samba Shared Repository