From 388ebed46e99c25ff4f436f9f347dd21ed5c73cd Mon Sep 17 00:00:00 2001 From: Sam Free5ide Date: Wed, 26 May 2021 20:30:35 +0300 Subject: [PATCH 1/2] Add cyrillic name for DA group --- windapsearch.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/windapsearch.py b/windapsearch.py index 2f56006..8425279 100755 --- a/windapsearch.py +++ b/windapsearch.py @@ -32,6 +32,8 @@ "Domain-Admins", "Domänen Administratoren", "Domänen-Administratoren", + "Администраторы домена", + "Администраторы-домена", ] # Privileged builtin AD groups relevant to look for From c502994241bdbdc4b970aaa7cd7a565d12977f7b Mon Sep 17 00:00:00 2001 From: Sam Free5ide Date: Wed, 26 May 2021 20:30:51 +0300 Subject: [PATCH 2/2] Fix resolve IP feature --- windapsearch.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windapsearch.py b/windapsearch.py index 8425279..8bd2894 100755 --- a/windapsearch.py +++ b/windapsearch.py @@ -379,7 +379,7 @@ def getComputerDict(self, computerResults, ipLookup=False): computerInfo = {} dn = computer.dn for attr in computer.get_attr_names(): - computerInfo[attr] = ','.join(computer.get_attr_values(attr)) + computerInfo[attr] = ','.join([val.decode() for val in computer.get_attr_values(attr)]) if 'dNSHostName' in computerInfo: hostname = computerInfo['dNSHostName'] @@ -489,7 +489,7 @@ def prettyPrintDictionary(results, attrs=None, separator=","): 'operatingSystemServicePack'] attrs = [] - for dn, computer in results.iteritems(): + for dn, computer in results.items(): for key in computer: keys.add(key)