summaryrefslogtreecommitdiff
path: root/source4/selftest
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-10-10 23:25:22 +0200
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:42:54 +0100
commit5c4a4b45667a714cb1154f20eccb56d00c1163a7 (patch)
tree93aec832c367911563100c64ce57ed7cf512e7a0 /source4/selftest
parent286157f4aa0cdc704fed1c9aa11895a44c9cab18 (diff)
downloadsamba-5c4a4b45667a714cb1154f20eccb56d00c1163a7.tar.gz
samba-5c4a4b45667a714cb1154f20eccb56d00c1163a7.tar.bz2
samba-5c4a4b45667a714cb1154f20eccb56d00c1163a7.zip
r25616: Fedora DS now has a way to install the schema and extra configuration
as part of the setup inf file. Andrew Bartlett (This used to be commit 6c8987464e198430885b9e71b54fed6758886fdd)
Diffstat (limited to 'source4/selftest')
-rw-r--r--source4/selftest/env/Samba4.pm10
1 files changed, 4 insertions, 6 deletions
diff --git a/source4/selftest/env/Samba4.pm b/source4/selftest/env/Samba4.pm
index 944ed83d58..c5b33bc897 100644
--- a/source4/selftest/env/Samba4.pm
+++ b/source4/selftest/env/Samba4.pm
@@ -192,18 +192,16 @@ 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_PREFIX}/bin" || die;
- if (system("perl $ENV{FEDORA_DS_PREFIX}/bin/ds_newinst.pl $fedora_ds_inf >&2") != 0) {
+ if (system("perl $ENV{FEDORA_DS_PREFIX}/sbin/setup-ds.pl --silent --file=$fedora_ds_inf >&2") != 0) {
chdir $dir;
- die("perl $ENV{FEDORA_DS_PREFIX}/bin/ds_newinst.pl $fedora_ds_inf FAILED: $?");
+ die("perl $ENV{FEDORA_DS_PREFIX}/sbin/setup-ds.pl --silent --file=$fedora_ds_inf FAILED: $?");
}
chdir $dir || die;
- system("cat $fedora_ds_extra_ldif >> $fedora_ds_dir/dse.ldif");
-
- 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 $fedora_ds_dir/schema/99_ad.ldif >&2") == 0 or die("schema conversion for Fedora DS failed");
-
return ($fedora_ds_dir, $pidfile);
}