r22287: Fix some issues in fedora ds code.

(This used to be commit e820f1d0f398a6ebfdf5be2f756f9f256d9c88d5)

diff --git a/source4/script/tests/Samba4.pm b/source4/script/tests/Samba4.pm
index 6ea37a4b92efcb916cef07b67231beae0180b07f..dd87411c8df12e3c23369f53755b7e7d1037ad19 100644 (file)
--- a/source4/script/tests/Samba4.pm
+++ b/source4/script/tests/Samba4.pm
@@ -167,6 +167,8 @@ sub mk_fedora($$$$$$)
 {
        my ($self, $ldapdir, $basedn, $root, $password, $privatedir, $configuration) = @_;
 
+       mkdir($ldapdir);
+
        my $fedora_ds_inf = "$ldapdir/fedorads.inf";
        my $fedora_ds_initial_ldif = "$ldapdir/fedorads-initial.ldif";
 
@@ -206,8 +208,8 @@ start_server= 0
 ";
        close(CONF);
 
-       open(CONF, ">$fedora_ds_initial_ldif");
-       print "
+       open(LDIF, ">$fedora_ds_initial_ldif");
+       print LDIF "
 # These entries need to be added to get the container for the 
 # provision to be aimed at.
 
@@ -224,7 +226,7 @@ objectclass: extensibleObject
 objectclass: nsBackendInstance
 nsslapd-suffix: $basedn
 ";
-       close(CONF);
+       close(LDIF);
 
        system("perl $ENV{FEDORA_DS_PREFIX}/bin/ds_newinst.pl $fedora_ds_inf >&2") == 0 or return 0;
 
@@ -248,7 +250,7 @@ nsslapd-pluginVersion: 1.1.0a3
 nsslapd-pluginVendor: Fedora Project
 nsslapd-pluginDescription: Allow bitwise matching rules
 ";
-       close(CONF);
+       close(LDIF);
 
        system("$self->{bindir}/ad2oLschema $configuration -H $privatedir/sam.ldb --option=convert:target=fedora-ds -I $self->{setupdir}/schema-map-fedora-ds-1.0 -O $fedora_ds_dir/schema/99_ad.ldif >&2");