From 5c4a4b45667a714cb1154f20eccb56d00c1163a7 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 10 Oct 2007 23:25:22 +0200 Subject: 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) --- source4/selftest/env/Samba4.pm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'source4/selftest/env') 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); } -- cgit