From 0f57633b027be5c478bd990be9693b380d1f2410 Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Thu, 5 Jul 2007 05:55:40 +0000 Subject: [PATCH] =?utf8?q?IPSec=20Ctrl=20nochmal=20ge=C3=A4ndert=20damit?= =?utf8?q?=20VPN=20Watch=20ordentlich=20gestartet=20wird?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@660 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- src/misc-progs/ipsecctrl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c index 7dc7f99c3..850b36dbe 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; } -- 2.39.2