diff --git a/windapsearch.py b/windapsearch.py index 2f56006..8bd2894 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 @@ -377,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'] @@ -487,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)