From 6d69e67dfdd68edbf682936d4c50562095039034 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 24 Apr 2007 07:57:44 +0000
Subject: r22498: The initial LDIF import into Fedora DS didn't work, so just
 push this onto the end of dse.ldif.

This make Fedora DS work with multiple naming contexts.

Andrew Bartlett
(This used to be commit 43deee4f938444349ad2d398670537f4537a6072)
---
 source4/script/tests/Samba4.pm | 53 +++++++++++++-----------------------------
 1 file changed, 16 insertions(+), 37 deletions(-)

(limited to 'source4')

diff --git a/source4/script/tests/Samba4.pm b/source4/script/tests/Samba4.pm
index e9166cef09..4fa6ba5873 100644
--- a/source4/script/tests/Samba4.pm
+++ b/source4/script/tests/Samba4.pm
@@ -201,7 +201,7 @@ Suffix= $basedn
 RootDN= cn=Manager,$basedn
 RootDNPwd= $password
 ServerIdentifier= samba4
-InstallLdifFile=$fedora_ds_initial_ldif
+#InstallLdifFile=$fedora_ds_initial_ldif
 
 inst_dir= $fedora_ds_dir
 config_dir= $fedora_ds_dir
@@ -220,38 +220,32 @@ start_server= 0
 	close(CONF);
 
 	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.
 
-dn: cn=\"$basedn\",cn=mapping tree,cn=config
-objectclass: top
-objectclass: extensibleObject
-objectclass: nsMappingTree
-nsslapd-state: backend
-nsslapd-backend: userData
-cn: $basedn
-
-dn: cn=userData,cn=ldbm database,cn=plugins,cn=config
-objectclass: extensibleObject
-objectclass: nsBackendInstance
-nsslapd-suffix: $basedn
-cn=userData
+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) {
+            chdir $dir;
+            die("perl $ENV{FEDORA_DS_PREFIX}/bin/ds_newinst.pl $fedora_ds_inf FAILED: $?");
+        }
+        chdir $dir || die;
+	foreach(<$fedora_ds_dir/schema/*>) {
+		unlink unless (/00core.*/);
+	}
 
-dn: cn=\"cn=Configuration,$basedn\",cn=mapping tree,cn=config
+	open(LDIF, ">>$fedora_ds_dir/dse.ldif");
+	print LDIF "dn: cn=\"cn=Configuration,$basedn\",cn=mapping tree,cn=config
 objectclass: top
 objectclass: extensibleObject
 objectclass: nsMappingTree
 nsslapd-state: backend
 nsslapd-backend: configData
-nsslapd-parent-suffix: $basedn
 cn: cn=Configuration,$basedn
 
 dn: cn=configData,cn=ldbm database,cn=plugins,cn=config
 objectclass: extensibleObject
 objectclass: nsBackendInstance
 nsslapd-suffix: cn=Configuration,$basedn
-cn=configData
+cn: configData
 
 dn: cn=\"cn=Schema,cn=Configuration,$basedn\",cn=mapping tree,cn=config
 objectclass: top
@@ -259,30 +253,15 @@ objectclass: extensibleObject
 objectclass: nsMappingTree
 nsslapd-state: backend
 nsslapd-backend: schemaData
-nsslapd-parent-suffix: cn=Configuration,$basedn
 cn: cn=Schema,cn=Configuration,$basedn
 
 dn: cn=schemaData,cn=ldbm database,cn=plugins,cn=config
 objectclass: extensibleObject
 objectclass: nsBackendInstance
 nsslapd-suffix: cn=Schema,cn=Configuration,$basedn
-cn=schemaData
-";
-	close(LDIF);
-
-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) {
-            chdir $dir;
-            die("perl $ENV{FEDORA_DS_PREFIX}/bin/ds_newinst.pl $fedora_ds_inf FAILED: $?");
-        }
-        chdir $dir || die;
-	foreach(<$fedora_ds_dir/schema/*>) {
-		unlink unless (/00core.*/);
-	}
+cn: schemaData
 
-	open(LDIF, ">>$fedora_ds_dir/dse.ldif");
-	print LDIF "dn: cn=bitwise,cn=plugins,cn=config
+dn: cn=bitwise,cn=plugins,cn=config
 objectClass: top
 objectClass: nsSlapdPlugin
 objectClass: extensibleObject
-- 
cgit