diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-04-17 00:53:07 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:50:56 -0500 |
| commit | 5dc27b36814d02c8b5754ebaab0859b4f382bf72 (patch) | |
| tree | d480922e4753b8614c4f3be14b029e5061a91b08 | |
| parent | 2c247996a93f86472f34728f4834a3229d6ecf89 (diff) | |
| download | samba-5dc27b36814d02c8b5754ebaab0859b4f382bf72.tar.gz samba-5dc27b36814d02c8b5754ebaab0859b4f382bf72.tar.bz2 samba-5dc27b36814d02c8b5754ebaab0859b4f382bf72.zip | |
r22287: Fix some issues in fedora ds code.
(This used to be commit e820f1d0f398a6ebfdf5be2f756f9f256d9c88d5)
| -rw-r--r-- | source4/script/tests/Samba4.pm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source4/script/tests/Samba4.pm b/source4/script/tests/Samba4.pm index 6ea37a4b92..dd87411c8d 100644 --- 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"); |