DMZ Pinholes korrigiert

Kleine Anpassung am Guardian Skript
Samba init beim restart das sleep verlängert

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

diff --git a/config/guardian/guardian.pl b/config/guardian/guardian.pl
index d06267b110c908e649e5490958450fa0d6f98b71..82e5c58cba13820492993dc882d1e948ca6d7f72 100644 (file)
--- a/config/guardian/guardian.pl
+++ b/config/guardian/guardian.pl
@@ -67,7 +67,6 @@ $counter=0;
 open (ALERT2, "/var/log/messages" ) or die "can't open /var/log/messages: $!\n";
 seek (ALERT2, 0, 2); # set the position to EOF. 
 # this is the same as a tail -f :)
-$counter2=0;
 
 for (;;) { 
   sleep 1; 
@@ -85,14 +84,7 @@ for (;;) {
           my @array=split(/ /,$_);&checkem ($array[5], $hostipaddr, "Portscan was detected.");} 
     } 
   } 
-  # Run this stuff every 30 seconds.. 
-  if ($counter == 30) {
-    &remove_blocks; # This might get moved elsewhere, depending on how much load
-                   # it puts on the system..
-    &check_log_name;
-    $counter=0;
-  } else { $counter=$counter+1; }
-  
+
   sleep 1; 
   if (seek(ALERT2,0,1)){ 
     while (<ALERT2>) { 
@@ -102,12 +94,12 @@ for (;;) {
     } 
   } 
   # Run this stuff every 30 seconds.. 
-  if ($counter2 == 30) {
+  if ($counter == 30) {
     &remove_blocks; # This might get moved elsewhere, depending on how much load
                    # it puts on the system..
     &check_log_name;
-    $counter2=0;
-  } else { $counter2=$counter2+1; }
+    $counter=0;
+  } else { $counter=$counter+1; }
 }
 
 sub check_log_name {

diff --git a/html/cgi-bin/dmzholes.cgi b/html/cgi-bin/dmzholes.cgi
index 26275ae802da289042805971911f127bf95035fd..5653095dcab0a5deae27f8e5ab7a5831b177c3c8 100644 (file)
--- a/html/cgi-bin/dmzholes.cgi
+++ b/html/cgi-bin/dmzholes.cgi
@@ -423,18 +423,14 @@ sub validNet
 
 sub haveOrangeNet
 {
-       if ($netsettings{'CONFIG_TYPE'} == 1) {return 1;}
-       if ($netsettings{'CONFIG_TYPE'} == 3) {return 1;}
-       if ($netsettings{'CONFIG_TYPE'} == 5) {return 1;}
-       if ($netsettings{'CONFIG_TYPE'} == 7) {return 1;}
+       if ($netsettings{'CONFIG_TYPE'} == 2) {return 1;}
+       if ($netsettings{'CONFIG_TYPE'} == 4) {return 1;}
        return 0;
 }
 
 sub haveBlueNet
 {
+       if ($netsettings{'CONFIG_TYPE'} == 3) {return 1;}
        if ($netsettings{'CONFIG_TYPE'} == 4) {return 1;}
-       if ($netsettings{'CONFIG_TYPE'} == 5) {return 1;}
-       if ($netsettings{'CONFIG_TYPE'} == 6) {return 1;}
-       if ($netsettings{'CONFIG_TYPE'} == 7) {return 1;}
        return 0;
 }

diff --git a/src/initscripts/init.d/samba b/src/initscripts/init.d/samba
index 5db06586908fc5417ffcce9190da3c66ce83e37d..a9bebeaf92229f5d95c3dcb7418e7258ce68ccc8 100644 (file)
--- a/src/initscripts/init.d/samba
+++ b/src/initscripts/init.d/samba
@@ -37,7 +37,7 @@ case "$1" in
 
        restart)
                $0 stop
-               sleep 3
+               sleep 5
                $0 start
                ;;