Fix ipsectrl I and ipsectrl R terminate vpn-watch.
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 29 May 2010 12:24:47 +0000 (14:24 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 29 May 2010 12:24:47 +0000 (14:24 +0200)
src/misc-progs/ipsecctrl.c

index aa0f41c..16fc86b 100644 (file)
@@ -172,6 +172,17 @@ int main(int argc, char *argv[]) {
                 
  FILE *file = NULL;
                 
+
+        if (strcmp(argv[1], "I") == 0) {
+                safe_system("/usr/sbin/ipsec whack --status");
+                exit(0);
+        }
+
+        if (strcmp(argv[1], "R") == 0) {
+                safe_system("/usr/sbin/ipsec whack --rereadall >/dev/null");
+                exit(0);
+        }
+
  /* Get vpnwatch pid */
 
  if ( (argc == 2) && (file = fopen("/var/run/vpn-watch.pid", "r"))) {
@@ -197,16 +208,6 @@ int main(int argc, char *argv[]) {
                         exit(0);
                 }
 
-                if (strcmp(argv[1], "R") == 0) {
-                        safe_system("/usr/sbin/ipsec whack --rereadall >/dev/null");
-                        exit(0);
-                }
-
-                if (strcmp(argv[1], "I") == 0) {
-                        safe_system("/usr/sbin/ipsec whack --status");
-                        exit(0);
-                }
-
         }
 
         /* clear iptables vpn rules */