Hide jabber and sentries modules by default

diff --git a/CHANGELOG b/CHANGELOG
index 28792d2..8bce0af 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -73,3 +73,5 @@ Added support for Slam64 Linux.
 Added Redhat Enterprise release 5 support.
 Requests to the /unauthenticated URL can never execute CGI programs, to provide an extra layer of security against URL escaping attacks.
 Fixed XSS bugs in pam_login.cgi.
+---- Changes since 1.370 ----
+Hid the Jabber and Security Sentries modules by default, as the underlying software is no longer supported.

diff --git a/setup.sh b/setup.sh
index 2537a73..6d367ef 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -77,6 +77,7 @@ fi
 
 # Validate source directory
 allmods=`cd "$srcdir"; echo */module.info | sed -e 's/\/module.info//g'`
+defaultallmods=`cd "$srcdir"; echo */module.info | grep -v jabber/module.info | grep -v sentry/module.info | sed -e 's/\/module.info//g'`
 if [ "$allmods" = "" ]; then
        echo "ERROR: Failed to get module list"
        echo ""
@@ -559,9 +560,9 @@ EOF
        afile=$config_dir/webmin.acl
        rm -f $afile
        if [ "$defaultmods" = "" ]; then
-               echo "$login: $allmods" >> $afile
+               echo $login: $defaultallmods >> $afile
        else
-               echo "$login: $defaultmods" >> $afile
+               echo $login: $defaultmods >> $afile
        fi
        chmod 600 $afile
        echo "..done"