svn commit: samba r22287 - in branches/SAMBA_4_0: . source/script/tests

[jelmer at samba.org]

Author: jelmer
Date: 2007-04-17 00:53:07 +0000 (Tue, 17 Apr 2007)
New Revision: 22287

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22287

Log:
Fix some issues in fedora ds code.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/script/tests/Samba4.pm


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revprop:branch-nick
   - real4
   + SAMBA_4_0
Name: bzr:merge
...skipped...

Modified: branches/SAMBA_4_0/source/script/tests/Samba4.pm
===================================================================
--- branches/SAMBA_4_0/source/script/tests/Samba4.pm	2007-04-17 00:30:01 UTC (rev 22286)
+++ branches/SAMBA_4_0/source/script/tests/Samba4.pm	2007-04-17 00:53:07 UTC (rev 22287)
@@ -167,6 +167,8 @@
 {
 	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 @@
 ";
 	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: 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-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");