svn commit: samba r23035 - in branches/SAMBA_4_0/source/selftest: .

[abartlet at samba.org]

Author: abartlet
Date: 2007-05-21 12:03:15 +0000 (Mon, 21 May 2007)
New Revision: 23035

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

Log:
We don't need to add this entry, and I hope to figure out how to avoid
adding the other two manually.

However, to do this we do need to skip the check (with -u) that
slaptest can access the db.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/selftest/Samba4.pm


Changeset:
Modified: branches/SAMBA_4_0/source/selftest/Samba4.pm
===================================================================
--- branches/SAMBA_4_0/source/selftest/Samba4.pm	2007-05-21 11:57:56 UTC (rev 23034)
+++ branches/SAMBA_4_0/source/selftest/Samba4.pm	2007-05-21 12:03:15 UTC (rev 23035)
@@ -435,11 +435,10 @@
 	}
 
 	system("slaptest -u -f $slapd_conf") == 0 or die("slaptest still fails after adding modules");
-	system("slapadd -b $basedn -f $slapd_conf -l $privatedir/$dnsname.ldif >/dev/null") == 0 or die("slapadd failed");
 	system("slapadd -b cn=Configuration,$basedn -f $slapd_conf -l $privatedir/$dnsname-config.ldif >/dev/null") == 0 or die("slapadd failed");
 	system("slapadd -b cn=Schema,cn=Configuration,$basedn -f $slapd_conf -l $privatedir/$dnsname-schema.ldif >/dev/null") == 0 or die("slapadd failed");
 
-    system("slaptest -f $slapd_conf >/dev/null") == 0 or 
+    system("slaptest -u -f $slapd_conf >/dev/null") == 0 or 
 		die ("slaptest after database load failed");
     
 	$ENV{PATH} = $oldpath;