svn commit: samba r22498 - in	branches/SAMBA_4_0/source/script/tests: . Author: abartlet Date: 2007-04-24 07:57:44 +0000 (Tue, 24 Apr 2007) New Revision: 22498 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22498 Log: 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 Modified:    branches/SAMBA_4_0/source/script/tests/Samba4.pm Changeset: Modified: branches/SAMBA_4_0/source/script/tests/Samba4.pm =================================================================== --- branches/SAMBA_4_0/source/script/tests/Samba4.pm	2007-04-24 05:57:56 UTC (rev 22497) +++ branches/SAMBA_4_0/source/script/tests/Samba4.pm	2007-04-24 07:57:44 UTC (rev 22498) @@ -201,7 +201,7 @@  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 @@  	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 +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=userData,cn=ldbm database,cn=plugins,cn=config -objectclass: extensibleObject -objectclass: nsBackendInstance -nsslapd-suffix: $basedn -cn=userData - -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: 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); +cn: schemaData   -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.*/); -	} - -	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