Improved helper configlets for wider compatibility.

diff --git a/helpers/basic_auth/DB/config.test b/helpers/basic_auth/DB/config.test
index 9b1b1dfc5a1638e68ebea75332aa268858a45b27..387b7b1185e129e0370af41bf7c04e71a7b8cceb 100755 (executable)
--- a/helpers/basic_auth/DB/config.test
+++ b/helpers/basic_auth/DB/config.test
@@ -2,6 +2,6 @@
 
 ## Test: do we have perl to build the helper scripts?
 ## Test: do we have pod2man to build the manual?
-perl --version >/dev/null && pod2man --help >/dev/null
+perl --version >/dev/null && echo | pod2man >/dev/null
 
 exit $?

diff --git a/helpers/basic_auth/RADIUS/config.test b/helpers/basic_auth/RADIUS/config.test
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/helpers/external_acl/wbinfo_group/config.test b/helpers/external_acl/wbinfo_group/config.test
index b9af8921e51af7add3cb3c7339a2959809ee829d..fdaf038639ae1e918d170258b7d18808eb74697d 100755 (executable)
--- a/helpers/external_acl/wbinfo_group/config.test
+++ b/helpers/external_acl/wbinfo_group/config.test
@@ -1,8 +1,12 @@
 #!/bin/sh
-if [ -x ${SAMBAPREFIX:-/usr/local/samba}/bin/wbinfo -a -x /usr/bin/perl ]; then
-       exit 0
-fi
-if [ -x /usr/bin/wbinfo -a -x /usr/bin/perl ]; then
-       exit 0
-fi
+
+for sambaprefix in ${SAMBAPREFIX} /usr/local /opt /opt/samba /usr/local/samba /usr
+do
+    for perlprefix in /usr /usr/local /opt /opt/perl
+    do
+        if [ -x $sambaprefix/bin/wbinfo -a -x $perlprefix/bin/perl ]; then
+            exit 0
+        fi
+    done
+done
 exit 1