From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 19 Aug 2013 11:27:16 +0000 (+0200)
Subject: Merge branch 'next' into firewall
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Ffirewall;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'next' into firewall

Conflicts:
	src/initscripts/init.d/tor
---

cfc8efa2f5a42a391bb6dfb320181bcc61f722e4
diff --cc src/initscripts/init.d/tor
index 863b420d3a,4fef577ac7..d631e867f9
--- a/src/initscripts/init.d/tor
+++ b/src/initscripts/init.d/tor
@@@ -9,9 -9,13 +9,13 @@@
  . /etc/sysconfig/rc
  . ${rc_functions}
  
 +eval $(/usr/local/bin/readhash /var/ipfire/tor/settings)
 +
+ function tor_is_enabled() {
+ 	[ "${TOR_ENABLED}" = "on" ] || [ "${TOR_RELAY_ENABLED}" = "on" ]
+ }
+ 
  function setup_firewall() {
 -	eval $(/usr/local/bin/readhash /var/ipfire/tor/settings)
 -
  	# Flush all rules.
  	flush_firewall