Samba-Update auf neues Patchlevel. Jaja, die Sicherheitsluecken oder sowas...

[ipfire-2.x.git] / src / initscripts / init.d / net / red / update

diff --git a/src/initscripts/init.d/net/red/update b/src/initscripts/init.d/net/red/update
index 4f2f379defe5f0cbaf04533fefd73abcbdf68a29..566bb65ef056ae6c52f8f7f34e195f0d1aa5edea 100644 (file)
--- a/src/initscripts/init.d/net/red/update
+++ b/src/initscripts/init.d/net/red/update
@@ -37,8 +37,8 @@ IFACE=`cat /var/ipfire/red/iface 2>/dev/null | tr -d '\012'`
 REMOTE=`cat /var/ipfire/red/remote-ipaddress 2>/dev/null | tr -d '\012'`
 
 ### DNS Settings
-DNS1=`cat /var/ipfire/red/dns1 2>/dev/null | tr -d '\012'`
-DNS2=`cat /var/ipfire/red/dns2 2>/dev/null | tr -d '\012'`
+DNS1=`cat /var/ipfire/red/dns1 2>/dev/null | tr -d '\012' 2>/dev/null`
+DNS2=`cat /var/ipfire/red/dns2 2>/dev/null | tr -d '\012' 2>/dev/null`
 echo > /var/ipfire/red/resolv.conf             #clear it
 [ "$DNS1" != "" ] && echo "nameserver $DNS1" >  /var/ipfire/red/resolv.conf
 [ "$DNS2" != "" ] && echo "nameserver $DNS2" >> /var/ipfire/red/resolv.conf
@@ -70,9 +70,7 @@ if ( echo $0 | /bin/grep -q 'dhcpcd.exe' ); then
        case "$2" in
         up)
                logger -p local0.info -t dhcpcd.exe[$$] "${INTERFACE} has been configured with old IP=${IPADDR}"
-               if [ "$RED_TYPE" != 'PPTP' ]; then
                        touch /var/ipfire/red/active
-               fi
                ;;
         new)   
                logger -p local0.info -t dhcpcd.exe[$$] "${INTERFACE} has been configured with new IP=${IPADDR}"
@@ -81,15 +79,13 @@ if ( echo $0 | /bin/grep -q 'dhcpcd.exe' ); then
                        /usr/local/bin/setportfw
                        /usr/local/bin/setxtaccess
                        /usr/local/bin/setddns.pl -f
-                       /usr/local/bin/restartsnort red
+           /usr/local/bin/snortctrl restart
                        sleep $VPN_DELAYED_START && /usr/local/bin/ipsecctrl S &
                        /bin/rm -f /var/lock/red.lock
                        logger -p local0.info -t red[$$] "unlocking from $$"
                        exit 0
                else
-                       if [ "$RED_TYPE" != 'PPTP' ]; then
                                touch /var/ipfire/red/active
-                       fi
                fi
                ;;
         down)
@@ -103,7 +99,8 @@ if [ -e "/var/ipfire/red/active" ]; then
        [ "$IFACE" != "" ] && ifconfig $IFACE -multicast
        /etc/rc.d/init.d/firewall reload
        /usr/local/bin/setfilters
-       /usr/local/bin/restartsnort red
+       /usr/local/bin/outgoingfwctrl
+       /usr/local/bin/snortctrl restart
        /usr/local/bin/qosctrl start
        /usr/local/bin/setportfw
        /usr/local/bin/setxtaccess