diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-08 13:32:38 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-08 13:32:38 +0200 |
| commit | dcc44f1757e24e169ca7730a5c56a0488cd5b110 (patch) | |
| tree | 8192a866e717df5a2788cb65bc11682b319cc9dc /source4/selftest/target/Samba4.pm | |
| parent | 8dd6f735bc6ff65a364ac65572529e8abf6f130a (diff) | |
| parent | 0e59c73fe3a5cde76881294f17bf6ca9258f67a1 (diff) | |
| download | samba-dcc44f1757e24e169ca7730a5c56a0488cd5b110.tar.gz samba-dcc44f1757e24e169ca7730a5c56a0488cd5b110.tar.bz2 samba-dcc44f1757e24e169ca7730a5c56a0488cd5b110.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into pidldocs
(This used to be commit c8dbf00b4490d804e1aac96a3fb66ff726bf9ef6)
Diffstat (limited to 'source4/selftest/target/Samba4.pm')
| -rw-r--r-- | source4/selftest/target/Samba4.pm | 5 |
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 = ""; |