summaryrefslogtreecommitdiff
path: root/source4/selftest/target
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-04-08 17:28:25 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-04-08 17:28:25 +1000
commitb2805c50eecddfa4cbd0945e713567eddce05895 (patch)
tree6433f88be2cae5e9e87558967d207922742c21cc /source4/selftest/target
parent3f2e403a8672323517e9a5efc4026d58f22fe75b (diff)
downloadsamba-b2805c50eecddfa4cbd0945e713567eddce05895.tar.gz
samba-b2805c50eecddfa4cbd0945e713567eddce05895.tar.bz2
samba-b2805c50eecddfa4cbd0945e713567eddce05895.zip
Re-add support for the --ldap-backend-port option to provision-backend
This option allows Fedora DS multi-master replication to work. I've tried to update the wiki and scripts to the largely consistant with each other. Andrew Bartlett (This used to be commit 42393c830733b2cc99ebccdafe944fcf3d82734f)
Diffstat (limited to 'source4/selftest/target')
-rw-r--r--source4/selftest/target/Samba4.pm5
1 files changed, 0 insertions, 5 deletions
diff --git a/source4/selftest/target/Samba4.pm b/source4/selftest/target/Samba4.pm
index 262c8035f6..552f6535af 100644
--- a/source4/selftest/target/Samba4.pm
+++ b/source4/selftest/target/Samba4.pm
@@ -201,8 +201,6 @@ sub mk_fedora_ds($$$)
my $pidfile = "$fedora_ds_dir/logs/slapd-samba4.pid";
- system("$self->{bindir}/ad2oLschema $configuration -H $ldapdir/schema-tmp.ldb --option=convert:target=fedora-ds -I $self->{setupdir}/schema-map-fedora-ds-1.0 -O $ldapdir/99_ad.ldif >&2") == 0 or die("schema conversion for Fedora DS failed");
-
my $dir = getcwd();
chdir "$ENV{FEDORA_DS_ROOT}/bin" || die;
if (system("perl $ENV{FEDORA_DS_ROOT}/sbin/setup-ds.pl --silent --file=$fedora_ds_inf >&2") != 0) {
@@ -222,9 +220,6 @@ sub mk_openldap($$$)
my $pidfile = "$ldapdir/slapd.pid";
my $modconf = "$ldapdir/modules.conf";
- #This uses the backend provision we just did, to read out the schema
- system("$self->{bindir}/ad2oLschema $configuration --option=convert:target=openldap -H $ldapdir/schema-tmp.ldb -I $self->{setupdir}/schema-map-openldap-2.3 -O $ldapdir/backend-schema.schema >&2") == 0 or die("schema conversion for OpenLDAP failed");
-
my $oldpath = $ENV{PATH};
my $olpath = "";
my $olroot = "";