From: maniacikarus <maniacikarus@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Thu, 5 Jul 2007 05:55:40 +0000 (+0000)
Subject: IPSec Ctrl nochmal geändert damit VPN Watch ordentlich gestartet wird
X-Git-Tag: v2.3-beta1~599
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=0f57633b027be5c478bd990be9693b380d1f2410

IPSec Ctrl nochmal geändert damit VPN Watch ordentlich gestartet wird


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

diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c
index 7dc7f99c3b..850b36dbe6 100644
--- a/src/misc-progs/ipsecctrl.c
+++ b/src/misc-progs/ipsecctrl.c
@@ -267,11 +267,11 @@ int main(int argc, char *argv[]) {
                 
  /* Get vpnwatch pid */
 
- if (file = fopen("/var/run/vpn-watch.pid", "r")) {
+ if ( (argc == 2) && (file = fopen("/var/run/vpn-watch.pid", "r"))) {
  safe_system("kill -9 $(cat /var/run/vpn-watch.pid)");
  safe_system("unlink /var/run/vpn-watch.pid)");
- }
  close(file);
+ }
  
         /* FIXME: workaround for pclose() issue - still no real idea why
          * this is happening */
@@ -431,6 +431,7 @@ int main(int argc, char *argv[]) {
                 safe_system("/usr/sbin/ipsec tncfg --clear >/dev/null");
                 safe_system("/etc/rc.d/init.d/ipsec restart >/dev/null");
                 add_alias_interfaces(configtype, redtype, if_red, (enable_red+enable_green+enable_orange+enable_blue) >>1 );
+                safe_system("/usr/local/bin/vpn-watch &");
                 exit(0);
         }
 
@@ -481,6 +482,5 @@ int main(int argc, char *argv[]) {
                 }
         }
         fclose(file);
-        safe_system("/usr/local/bin/vpn-watch &");
         return 0;
 }