From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 23 Apr 2010 12:18:01 +0000 (+0200)
Subject: misc-progs: Cleanup chain creation of wirelessctrl.
X-Git-Tag: v2.9-beta1~359
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8cc93ee11f1788332847c72afbbb2688b3206023;p=ipfire-2.x.git

misc-progs: Cleanup chain creation of wirelessctrl.

This changes the behaviour of the wirelessctrl binary
that will no longer create useless rules in the WIRELESSINPUT
and WIRELESSFORWARD chains that have no use at all.

So we keep this chain empty if /var/ipfire/wireless/nodrop
is existant.
---

diff --git a/src/misc-progs/wirelessctrl.c b/src/misc-progs/wirelessctrl.c
index 40fb67e0dc..fbcf90e018 100644
--- a/src/misc-progs/wirelessctrl.c
+++ b/src/misc-progs/wirelessctrl.c
@@ -101,11 +101,11 @@ int main(void)
 							exit(0);
 				}
 
-				if (!(fd = fopen(CONFIG_ROOT "/wireless/nodrop", "r")))
-				{
+				if ((fd = fopen(CONFIG_ROOT "/wireless/nodrop", "r")))
+					return 0;
+
 				/* register exit handler to ensure the block rule is always present */
 				atexit(exithandler);
-				}
 
 				if (!(fd = fopen(CONFIG_ROOT "/wireless/config", "r")))
 				{