From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 15 Aug 2013 11:30:45 +0000 (+0200)
Subject: wirelessctrl: Don't read nodrop file any more.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d55fbf75a88cfa6fdc3b4be815f29306cf35f505;p=people%2Fms%2Fipfire-2.x.git

wirelessctrl: Don't read nodrop file any more.
---

diff --git a/src/initscripts/init.d/tor b/src/initscripts/init.d/tor
index e27241f561..863b420d3a 100644
--- a/src/initscripts/init.d/tor
+++ b/src/initscripts/init.d/tor
@@ -9,9 +9,9 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
-function setup_firewall() {
-	eval $(/usr/local/bin/readhash /var/ipfire/tor/settings)
+eval $(/usr/local/bin/readhash /var/ipfire/tor/settings)
 
+function setup_firewall() {
 	# Flush all rules.
 	flush_firewall
 
diff --git a/src/misc-progs/wirelessctrl.c b/src/misc-progs/wirelessctrl.c
index 450aa368fe..bd3e60d674 100644
--- a/src/misc-progs/wirelessctrl.c
+++ b/src/misc-progs/wirelessctrl.c
@@ -101,9 +101,6 @@ int main(void)
 							exit(0);
 				}
 
-				if ((fd = fopen(CONFIG_ROOT "/wireless/nodrop", "r")))
-					return 0;
-
 				/* register exit handler to ensure the block rule is always present */
 				atexit(exithandler);