diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-08 04:35:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:17:55 -0500 |
| commit | caa4bfce7c2e152bcdf95878677913987af70cbd (patch) | |
| tree | e340fddad34adffbb84b686c325b7a0edcc941ff /source4/script/tests/mktestsetup.sh | |
| parent | 8d21ad6c25d1298d3a682077a2080571ccb70030 (diff) | |
| download | samba-caa4bfce7c2e152bcdf95878677913987af70cbd.tar.gz samba-caa4bfce7c2e152bcdf95878677913987af70cbd.tar.bz2 samba-caa4bfce7c2e152bcdf95878677913987af70cbd.zip | |
r18247: more shell portability fixes
(This used to be commit d9ddfdf9e86295224dd42c0ab1aa954111ede588)
Diffstat (limited to 'source4/script/tests/mktestsetup.sh')
| -rwxr-xr-x | source4/script/tests/mktestsetup.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/script/tests/mktestsetup.sh b/source4/script/tests/mktestsetup.sh index f21d0a2354..a482f62a40 100755 --- a/source4/script/tests/mktestsetup.sh +++ b/source4/script/tests/mktestsetup.sh @@ -331,22 +331,22 @@ MODCONF=$LDAPDIR/modules.conf rm -f $MODCONF touch $MODCONF -if ! slaptest -u -f $SLAPD_CONF > /dev/null 2>&1; then +slaptest -u -f $SLAPD_CONF > /dev/null 2>&1 || { echo "enabling slapd modules" cat > $MODCONF <<EOF modulepath /usr/lib/ldap moduleload back_bdb EOF -fi +} if slaptest -u -f $SLAPD_CONF; then - if ! slapadd -f $SLAPD_CONF < $PRIVATEDIR/$DNSNAME.ldif; then + slapadd -f $SLAPD_CONF < $PRIVATEDIR/$DNSNAME.ldif || { echo "slapadd failed" - fi + } - if ! slaptest -f $SLAPD_CONF; then + slaptest -f $SLAPD_CONF || { echo "slaptest after database load failed" - fi + } fi PATH=$OLDPATH |