Attachment #6027 for bug #23289

Lines 40-45 Link Here

(-)univention-adsearch (-4 / +6 lines)
40	import ldap.sasl	40	import ldap.sasl
41	import subprocess	41	import subprocess
42	import string	42	import string
		43	import locale
		44	default_encoding = locale.getdefaultlocale()[1]
43		45
44	class kerberosAuthenticationFailed(Exception): pass	46	class kerberosAuthenticationFailed(Exception): pass
45		47
Lines 109-115 Link Here
109	print "ERROR: no filter given"	111	print "ERROR: no filter given"
110	usage()	112	usage()
111	sys.exit(1)	113	sys.exit(1)
112	filter_tmp = sys.argv[oiterator].decode('latin')	114	filter_tmp = sys.argv[oiterator].decode(default_encoding)
113		115
114	if len(sys.argv) > oiterator+1:	116	if len(sys.argv) > oiterator+1:
115	filter_attributes = sys.argv[oiterator+1].split(',')	117	filter_attributes = sys.argv[oiterator+1].split(',')
Lines 232-238 Link Here
232		234
233	print "#"	235	print "#"
234	print "# univention-adsearch"	236	print "# univention-adsearch"
235	print "# filter: %s" % filter.encode('latin')	237	print "# filter: %s" % filter.encode(default_encoding)
236	print "#"	238	print "#"
237		239
238	for r in res:	240	for r in res:
Lines 240-246 Link Here
240	n_referrals += 1	242	n_referrals += 1
241	continue	243	continue
242	print ""	244	print ""
243	print "%s: %s"%('DN',unicode(r[0],'utf8').encode('latin'))	245	print "%s: %s"%('DN',unicode(r[0],'utf8').encode(default_encoding))
244	for key in r[1]:	246	for key in r[1]:
245	if key in ["objectGUID",'ipsecData','repsFrom','replUpToDateVector']:	247	if key in ["objectGUID",'ipsecData','repsFrom','replUpToDateVector']:
246	print "%s: %s"%(key,r[1][key])	248	print "%s: %s"%(key,r[1][key])
Lines 261-267 Link Here
261	print "%s: %s"%(key,sid)	263	print "%s: %s"%(key,sid)
262	else:	264	else:
263	try:	265	try:
264	print "%s: %s"%(key,unicode(val,'utf8').encode('latin'))	266	print "%s: %s"%(key,unicode(val,'utf8').encode(default_encoding))
265	except:	267	except:
266	print "failed: %s"%key	268	print "failed: %s"%key
267		269




import univention
import univention.connector
import univention.connector.ad

import univention.config_registry
import locale
default_encoding = locale.getdefaultlocale()[1]

CONFIGBASENAME="connector"


	print "\n\tUCS rejected\n"
	for filename,dn in ad.list_rejected_ucs():
		found_rejected = True
		print "%5d:   UCS DN: %s" % (i, univention.connector.ad.encode_attrib(dn).encode(default_encoding))
		ad_dn = univention.connector.ad.encode_attrib(ad.get_dn_by_ucs(dn)).encode(default_encoding)
		if ad_dn:
			print "          AD DN: %s" % ad_dn
		else:

	print "\nAD rejected\n"
	for id,dn in ad.list_rejected():
		found_rejected = True
		print "%5d:    AD DN: %s" % (i,univention.connector.ad.encode_attrib(dn).encode(default_encoding))
		ucs_dn = univention.connector.ad.encode_attrib(ad.get_dn_by_con(dn)).encode(default_encoding)
		if ucs_dn:
			print "         UCS DN: %s" % ucs_dn
		else:

Return to bug 23289

Lines 38-45 Link Here

(-)univention-connector-list-rejected (-5 / +6 lines)
38	import univention	38	import univention
39	import univention.connector	39	import univention.connector
40	import univention.connector.ad	40	import univention.connector.ad
41
42	import univention.config_registry	41	import univention.config_registry
		42	import locale
		43	default_encoding = locale.getdefaultlocale()[1]
43		44
44	CONFIGBASENAME="connector"	45	CONFIGBASENAME="connector"
45		46
Lines 155-162 Link Here
155	print "\n\tUCS rejected\n"	156	print "\n\tUCS rejected\n"
156	for filename,dn in ad.list_rejected_ucs():	157	for filename,dn in ad.list_rejected_ucs():
157	found_rejected = True	158	found_rejected = True
158	print "%5d: UCS DN: %s" % (i, univention.connector.ad.encode_attrib(dn).encode('latin'))	159	print "%5d: UCS DN: %s" % (i, univention.connector.ad.encode_attrib(dn).encode(default_encoding))
159	ad_dn = univention.connector.ad.encode_attrib(ad.get_dn_by_ucs(dn)).encode('latin')	160	ad_dn = univention.connector.ad.encode_attrib(ad.get_dn_by_ucs(dn)).encode(default_encoding)
160	if ad_dn:	161	if ad_dn:
161	print " AD DN: %s" % ad_dn	162	print " AD DN: %s" % ad_dn
162	else:	163	else:
Lines 168-175 Link Here
168	print "\nAD rejected\n"	169	print "\nAD rejected\n"
169	for id,dn in ad.list_rejected():	170	for id,dn in ad.list_rejected():
170	found_rejected = True	171	found_rejected = True
171	print "%5d: AD DN: %s" % (i,univention.connector.ad.encode_attrib(dn).encode('latin'))	172	print "%5d: AD DN: %s" % (i,univention.connector.ad.encode_attrib(dn).encode(default_encoding))
172	ucs_dn = univention.connector.ad.encode_attrib(ad.get_dn_by_con(dn)).encode('latin')	173	ucs_dn = univention.connector.ad.encode_attrib(ad.get_dn_by_con(dn)).encode(default_encoding)
173	if ucs_dn:	174	if ucs_dn:
174	print " UCS DN: %s" % ucs_dn	175	print " UCS DN: %s" % ucs_dn
175	else:	176	else: