r17765: fix handling of old solaris /bin/sh in ldb build/test

(This used to be commit f41d3ed4b3d76c37c9c5bfd15e9e4e27179450f0)

diff --git a/source4/lib/ldb/docs/builddocs.sh b/source4/lib/ldb/docs/builddocs.sh
index b071f0f9549fff972a67356c9307e623ddae1096..64835c9efe9a838dc666c78c7c482354da12c3f8 100755 (executable)
--- a/source4/lib/ldb/docs/builddocs.sh
+++ b/source4/lib/ldb/docs/builddocs.sh
@@ -5,7 +5,7 @@
 XSLTPROC="$1"
 SRCDIR="$2"
 
-if ! test -x "$XSLTPROC"; then
+if [ -z "$XSLTPROC" ] || [ ! -x "$XSLTPROC" ]; then
     echo "xsltproc not installed"
     exit 0
 fi

diff --git a/source4/lib/ldb/tests/test-generic.sh b/source4/lib/ldb/tests/test-generic.sh
index 363bf89065d083e5a117aff753d3bf25581e18a6..1f81723d5e62b4f95b06292949134f08fcf02e7d 100755 (executable)
--- a/source4/lib/ldb/tests/test-generic.sh
+++ b/source4/lib/ldb/tests/test-generic.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 
 if [ -z "$LDB_SPECIALS" ]; then
-    export LDB_SPECIALS=1
+    LDB_SPECIALS=1
+    export LDB_SPECIALS
 fi
 
 echo "LDB_URL: $LDB_URL"

diff --git a/source4/lib/ldb/tests/test-ldap.sh b/source4/lib/ldb/tests/test-ldap.sh
index e2ce81c99f5e29c40258f9ce059fe056c73863fe..63e93e0fb0760a3a0b3f1c4ddc2d2742a89af792 100755 (executable)
--- a/source4/lib/ldb/tests/test-ldap.sh
+++ b/source4/lib/ldb/tests/test-ldap.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-export PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH
+PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH
+export PATH
 SCHEMA_NEEDED="core nis cosine inetorgperson openldap"
 
 # setup needed schema files
@@ -29,7 +30,8 @@ if [ -z "$LDBDIR" ]; then
     export LDBDIR
 fi
 
-export LDB_URL=`$LDBDIR/tests/ldapi_url.sh`
+LDB_URL=`$LDBDIR/tests/ldapi_url.sh`
+export LDB_URL
 
 PATH=bin:$PATH
 export PATH
@@ -37,5 +39,6 @@ export PATH
 . $LDBDIR/tests/init_slapd.sh
 . $LDBDIR/tests/start_slapd.sh
 
-export LDB_SPECIALS=0
+LDB_SPECIALS=0
+export LDB_SPECIALS
 . $LDBDIR/tests/test-generic.sh