View | Details | Raw Unified | Return to bug 23289 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/sbin/univention-adsearch (-4 / +4 lines)
 Lines 101-107    Link Here 
101
    print "ERROR: no filter given"
101
    print "ERROR: no filter given"
102
    usage()
102
    usage()
103
    sys.exit(1)
103
    sys.exit(1)
104
filter_tmp = sys.argv[oiterator].decode('latin')
104
filter_tmp = sys.argv[oiterator].decode('utf8')
105
105
106
if len(sys.argv) > oiterator+1:
106
if len(sys.argv) > oiterator+1:
107
    filter_attributes = sys.argv[oiterator+1].split(',')
107
    filter_attributes = sys.argv[oiterator+1].split(',')
 Lines 183-189    Link Here 
183
183
184
print "#"
184
print "#"
185
print "# univention-adsearch"
185
print "# univention-adsearch"
186
print "# filter: %s" % filter.encode('latin')
186
print "# filter: %s" % filter.encode('utf8')
187
print "#"
187
print "#"
188
188
189
for r in res:
189
for r in res:
 Lines 191-197    Link Here 
191
		n_referrals += 1
191
		n_referrals += 1
192
		continue
192
		continue
193
	print ""
193
	print ""
194
	print "%s: %s"%('DN',unicode(r[0],'utf8').encode('latin'))
194
	print "%s: %s"%('DN',unicode(r[0],'utf8').encode('utf8'))
195
	for key in r[1]:
195
	for key in r[1]:
196
		if key in ["objectGUID",'ipsecData','repsFrom','replUpToDateVector']:
196
		if key in ["objectGUID",'ipsecData','repsFrom','replUpToDateVector']:
197
			print "%s: %s"%(key,r[1][key])
197
			print "%s: %s"%(key,r[1][key])
 Lines 212-218    Link Here 
212
				print "%s: %s"%(key,sid)		
212
				print "%s: %s"%(key,sid)		
213
			else:
213
			else:
214
				try:
214
				try:
215
					print "%s: %s"%(key,unicode(val,'utf8').encode('latin'))
215
					print "%s: %s"%(key,unicode(val,'utf8').encode('utf8'))
216
				except:
216
				except:
217
					print "failed: %s"%key
217
					print "failed: %s"%key
218
218

Return to bug 23289