r23035: 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

diff --git a/source/selftest/Samba4.pm b/source/selftest/Samba4.pm
index 34fe0a03f28b425163f18b91d727201d6326a427..6882539dc871d8f8f4dd72ac90c00f0dca29b117 100644 (file)
--- a/source/selftest/Samba4.pm
+++ b/source/selftest/Samba4.pm
@@ -435,11 +435,10 @@ moduleload        syncprov
        }
 
        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;