diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-05-21 12:03:15 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:52:43 -0500 |
| commit | 43da48650ac5e8eaa3d8445c096fd9386c0afb18 (patch) | |
| tree | eb485292863dd4187ceadc0d2969a3287cf071ae /source4 | |
| parent | 4dbbf7fed362cab64237fa64af5640fccf4a9b4c (diff) | |
| download | samba-43da48650ac5e8eaa3d8445c096fd9386c0afb18.tar.gz samba-43da48650ac5e8eaa3d8445c096fd9386c0afb18.tar.bz2 samba-43da48650ac5e8eaa3d8445c096fd9386c0afb18.zip | |
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
(This used to be commit ea206dce06d97c60868e44aab9281dcbbb393931)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/selftest/Samba4.pm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source4/selftest/Samba4.pm b/source4/selftest/Samba4.pm index 34fe0a03f2..6882539dc8 100644 --- a/source4/selftest/Samba4.pm +++ b/source4/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; |