openvpnctrl: Create firewall rules properly if roadwarrior server is disabled.

diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c
index 68bbe2fff5e874c33180f2bb0a05f42aceb183ee..73cfb1df98f7318ef1f839ff87e1fe6d6a006360 100644 (file)
--- a/src/misc-progs/openvpnctrl.c
+++ b/src/misc-progs/openvpnctrl.c
@@ -268,39 +268,34 @@ void createChain(char *chain) {
 }
 
 void createAllChains(void) {
-       if (!((strcmp(enablered, "on")==0) || (strcmp(enableblue, "on")==0) || (strcmp(enableorange, "on")==0))){
-               fprintf(stderr, "OpenVPN is not enabled on any interface\n");
-               exit(1);
-       } else {
-               // create chain and chain references
-               if (!strcmp(enableorange, "on")) {
-                       if (strlen(orangeif)) {
-                               createChain(OVPNORANGE);
-                               createChainReference(OVPNORANGE);
-                       } else {
-                               fprintf(stderr, "OpenVPN enabled on orange but no orange interface found\n");
-                               //exit(1);
-                       }
+       // create chain and chain references
+       if (!strcmp(enableorange, "on")) {
+               if (strlen(orangeif)) {
+                       createChain(OVPNORANGE);
+                       createChainReference(OVPNORANGE);
+               } else {
+                       fprintf(stderr, "OpenVPN enabled on orange but no orange interface found\n");
+                       //exit(1);
                }
-       
-               if (!strcmp(enableblue, "on")) {
-                       if (strlen(blueif)) {
-                               createChain(OVPNBLUE);
-                               createChainReference(OVPNBLUE);
-                       } else {
-                               fprintf(stderr, "OpenVPN enabled on blue but no blue interface found\n");
-                               //exit(1);
-                       }
+       }
+
+       if (!strcmp(enableblue, "on")) {
+               if (strlen(blueif)) {
+                       createChain(OVPNBLUE);
+                       createChainReference(OVPNBLUE);
+               } else {
+                       fprintf(stderr, "OpenVPN enabled on blue but no blue interface found\n");
+                       //exit(1);
                }
-       
-               if (!strcmp(enablered, "on")) {
-                       if (strlen(redif)) {
-                               createChain(OVPNRED);
-                               createChainReference(OVPNRED);
-                       } else {
-                               fprintf(stderr, "OpenVPN enabled on red but no red interface found\n");
-                               //exit(1);
-                       }
+       }
+
+       if (!strcmp(enablered, "on")) {
+               if (strlen(redif)) {
+                       createChain(OVPNRED);
+                       createChainReference(OVPNRED);
+               } else {
+                       fprintf(stderr, "OpenVPN enabled on red but no red interface found\n");
+                       //exit(1);
                }
        }
 }
@@ -310,12 +305,6 @@ void setFirewallRules(void) {
        char dport[STRING_SIZE] = "";
        char dovpnip[STRING_SIZE] = "";
 
-       /* check if it makes sence to proceed further */
-       if (!((strcmp(enablered, "on")==0) || (strcmp(enableblue, "on")==0) || (strcmp(enableorange, "on")==0))){
-               fprintf(stderr, "Config error, at least one device must be enabled\n");
-               exit(1);
-       }
-
        kv = initkeyvalues();
        if (!readkeyvalues(kv, CONFIG_ROOT "/ovpn/settings"))
        {