diff --git a/services/univention-ad-connector/univention-adsearch b/services/univention-ad-connector/univention-adsearch index e717a8e228..cb1eb7bcfb 100755 --- a/services/univention-ad-connector/univention-adsearch +++ b/services/univention-ad-connector/univention-adsearch @@ -213,18 +213,24 @@ for r in res: print "DN: %s" % r[0] for key in r[1]: for val in r[1][key]: + b64 = False if key in ["objectSid"]: val = decode_sid(val) elif key in ['objectGUID']: val = str(ndr_unpack(misc.GUID, val)) elif key in ['dnsRecord', 'auditingPolicy']: val = base64.b64encode(val) + b64 = True else: try: val = unicode(val) except UnicodeDecodeError: val = base64.b64encode(val) - print "%s: %s" % (key, val) + b64 = True + if b64: + print "%s:: %s" % (key, val) + else: + print "%s: %s" % (key, val) print "" print "#" print "# results: %s" % (n_results - n_referrals)