Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions windapsearch.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
"Domain-Admins",
"Domänen Administratoren",
"Domänen-Administratoren",
"Администраторы домена",
"Администраторы-домена",
]

# Privileged builtin AD groups relevant to look for
Expand Down Expand Up @@ -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']
Expand Down Expand Up @@ -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)

Expand Down