sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00
Code

r18247: more shell portability fixes

Browse Source 
(This used to be commit d9ddfdf9e86295224dd42c0ab1aa954111ede588)
This commit is contained in:
Andrew Tridgell 2006-09-08 04:35:41 +00:00 committed by Gerald (Jerry) Carter
parent 8d21ad6c25
commit caa4bfce7c
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source4/script/tests/mktestsetup.sh
View File

@ -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

4
source4/script/tests/selftest.sh
View File

@ -58,10 +58,10 @@ incdir=`dirname $ARG0`
if [ x"$TEST_LDAP" = x"yes" ]; then
slapd_start
echo -n "LDAP PROVISIONING..."
if ! $srcdir/bin/smbscript $srcdir/setup/provision $PROVISION_OPTIONS --ldap-backend=$LDAPI; then
$srcdir/bin/smbscript $srcdir/setup/provision $PROVISION_OPTIONS --ldap-backend=$LDAPI || {
echo "LDAP PROVISIONING failed: $srcdir/bin/smbscript $srcdir/setup/provision $PROVISION_OPTIONS --ldap-backend=$LDAPI"
exit 1;
fi
}
fi
SMBD_TEST_FIFO="$PREFIX/smbd_test.fifo"

3
source4/script/tests/test_cifsdd.sh
View File

@ -37,8 +37,7 @@ compare() {
if [ -r $1 -a -r $2 ] ; then
sum1=`sum $1`
sum2=`sum $2`
[[ x"$sum1" = x"$sum2" ]]
test "$sum1" = "$sum2"
else
false
fi