From 5795c466c1a5863c54e5595b2251eb64be13a9d5 Mon Sep 17 00:00:00 2001
From: bonanza123 <bonanza123@noreply.github.com>
Date: Sun, 25 Dec 2016 11:49:34 +0100
Subject: [PATCH] first attempt to generalize tor user detection

---
 toriptables2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toriptables2.py b/toriptables2.py
index 723eedd..df4a9e8 100755
--- a/toriptables2.py
+++ b/toriptables2.py
@@ -28,7 +28,7 @@ class TorIptables(object):
     self.local_loopback = "127.0.0.1" # Local loopback 
     self.non_tor_net = ["192.168.0.0/16", "172.16.0.0/12"]
     self.non_tor = ["127.0.0.0/9", "127.128.0.0/10", "127.0.0.0/8"]
-    self.tor_uid = getoutput("id -ur tor")  # Tor user uid
+    self.tor_uid = getoutput("id -ur debian-tor 2>/dev/null  || id -ur tor 2>/dev/null")  # Tor user uid
     self.trans_port = "9040"  # Tor port
     self.tor_config_file = '/etc/tor/torrc'
     self.torrc = r'''