Rev 11883: Fix some issues in fedora ds code. in file:///home/jelmer/bzr.samba/SAMBA_4_0/

Jelmer Vernooij jelmer at samba.org
Tue Apr 17 01:51:46 GMT 2007


At file:///home/jelmer/bzr.samba/SAMBA_4_0/

------------------------------------------------------------
revno: 11883
revision-id: jelmer at samba.org-20070417015128-npyzu1s7i89wmc12
parent: svn-v2:22286 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Tue 2007-04-17 03:51:28 +0200
message:
  Fix some issues in fedora ds code.
modified:
  source/script/tests/Samba4.pm  svn-v2:21707 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2fSamba4.pm
=== modified file 'source/script/tests/Samba4.pm'
--- a/source/script/tests/Samba4.pm	2007-04-17 00:30:01 +0000
+++ b/source/script/tests/Samba4.pm	2007-04-17 01:51:28 +0000
@@ -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");
 



More information about the samba-cvs mailing list