From 2cb1563f63386b35a69e460051aa9b4a2851d104 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 30 May 2012 07:30:44 -0400
Subject: [PATCH] - Added (clickable) placeholders to client messaging function. - Added check so that the client password isn't inserted into the message (for security reasons).
---
install/apps/bastille-firewall | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/install/apps/bastille-firewall b/install/apps/bastille-firewall
index 2f701ec..d5723db 100644
--- a/install/apps/bastille-firewall
+++ b/install/apps/bastille-firewall
@@ -41,10 +41,24 @@
#
# ** As of 0.99-beta1, this script merely kicks off the real script,
# either /sbin/bastille-ipchains or /sbin/bastille-netfilter
-
+#
# Default is to use the 'ipchains' script, which will load the
# ipchains compatibility module if you're using a 2.4 kernel
-REALSCRIPT=/sbin/bastille-ipchains
+#
+### BEGIN INIT INFO
+# Provides: Bastille-Firewall
+# Required-Start: $syslog
+# Should-Start:
+# Required-Stop:
+# Should-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Bastille Firewall
+# Description: Bastille Firewall for iptables and ipchains
+### END INIT INFO
+
+
+REALSCRIPT=/sbin/bastille-netfilter
PATH=/sbin:/bin:/usr/sbin:/usr/bin
# exit function to be called in place of regular Bourne exit
@@ -62,13 +76,6 @@
echo "ERROR: bastille-firewall currently being reset or lock is stuck."
echo "To un-stick, remove the directory /var/lock/bastille-firewall"
exit 1
-fi
-
-if [ -n "$(uname -r | awk -F. ' $1 == 2 && $2 > 2 {print}')" ]; then
- # We are using Linux 2.3 or newer; use the netfilter script if available
- if [ -x /sbin/bastille-netfilter ]; then
- REALSCRIPT=/sbin/bastille-netfilter
- fi
fi
if [ ! -x ${REALSCRIPT} ]; then
--
Gitblit v1.9.1