kleiner Snort Fix und fehlendes Icon nachgeliefert

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@662 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/snort/snort.conf b/config/snort/snort.conf
index 5d35d07c4dbdae71060ab41cc22a29029b9d8853..7ded8c0a3f39dcd20237bb4e918e6ee4808fc87c 100644 (file)
--- a/config/snort/snort.conf
+++ b/config/snort/snort.conf
@@ -70,22 +70,6 @@ preprocessor flow-portscan: \
 include $RULE_PATH/classification.config
 include $RULE_PATH/reference.config
 #=========================================
-include $RULE_PATH/bleeding-attack_response.rules
-include $RULE_PATH/bleeding-botcc.rules
-include $RULE_PATH/bleeding-dos.rules
-include $RULE_PATH/bleeding-drop.rules
-include $RULE_PATH/bleeding-dshield.rules
-include $RULE_PATH/bleeding-exploit.rules
-include $RULE_PATH/bleeding-game.rules
-include $RULE_PATH/bleeding-inappropriate.rules
-include $RULE_PATH/bleeding-malware.rules
-include $RULE_PATH/bleeding-p2p.rules
-include $RULE_PATH/bleeding-policy.rules
-include $RULE_PATH/bleeding-scan.rules
-include $RULE_PATH/bleeding-virus.rules
-include $RULE_PATH/bleeding-voip.rules
-include $RULE_PATH/bleeding-web.rules
-include $RULE_PATH/bleeding.rules
 include $RULE_PATH/community-bot.rules
 include $RULE_PATH/community-deleted.rules
 include $RULE_PATH/community-dos.rules

diff --git a/html/html/images/edit-find.png b/html/html/images/edit-find.png
new file mode 100644 (file)
index 0000000..d072d3c
Binary files /dev/null and b/html/html/images/edit-find.png differ

diff --git a/src/initscripts/init.d/snort b/src/initscripts/init.d/snort
index 134f22d289a83d63b90bedd77f80d58b08fbe6d9..60b937835b878682da07573bbe96bafba947a349 100755 (executable)
--- a/src/initscripts/init.d/snort
+++ b/src/initscripts/init.d/snort
@@ -79,6 +79,10 @@ case "$1" in
             if [ -r /var/run/snort_$ORANGE_DEV.pid ]; then
                 DEVICES+="$ORANGE_DEV "
        fi
+       if [ "$ENABLE_SNORT" == "on" ]; then
+                DEVICES+="`cat /var/ipfire/red/iface` "
+       fi
+       
                for DEVICE in $DEVICES; do
                        boot_mesg "Stopping Intrusion Detection System on $DEVICE..."
                        killproc -p /var/run/snort_$DEVICE.pid /var/run