View | Details | Raw Unified | Return to bug 31083
Collapse All | Expand All

(-)modules/univention/s4connector/s4/__init__.py (-3 / +6 lines)
 Lines 272-280    Link Here 
272
							pass # values are not the same codec
272
							pass # values are not the same codec
273
								
273
								
274
				
274
				
275
				ud.debug(ud.LDAP, ud.INFO, "samaccount_dn_mapping: search in s4 samaccountname=%s"%value)
275
				filter_s4 = '(objectclass=%s)(samaccountname=%s)' % (ocs4, value)
276
				result = s4connector.lo_s4.lo.search_ext_s(s4connector.lo_s4.base,ldap.SCOPE_SUBTREE,
276
				if dn_attr and dn_attr_val:
277
								     compatible_modstring('(&(objectclass=%s)(samaccountname=%s))'%(ocs4,value)), ['sAMAccountName'])
277
					filter_s4 = filter_s4 + '(%s=%s)' % (dn_attr, dn_attr_val)
278
				filter_s4 = compatible_modstring('(&%s)' % filter_s4)
279
				ud.debug(ud.LDAP, ud.INFO, "samaccount_dn_mapping: search in s4 %s" % filter_s4)
280
				result = s4connector.lo_s4.lo.search_ext_s(s4connector.lo_s4.base,ldap.SCOPE_SUBTREE, filter_s4, ['sAMAccountName'])
278
				if result and len(result)>0 and result[0] and len(result[0])>0 and result[0][0]: # no referral, so we've got a valid result
281
				if result and len(result)>0 and result[0] and len(result[0])>0 and result[0][0]: # no referral, so we've got a valid result
279
					s4dn = encode_attrib(result[0][0])
282
					s4dn = encode_attrib(result[0][0])
280
					s4pos2 = len(univention.s4connector.s4.explode_unicode_dn(s4dn)[0])
283
					s4pos2 = len(univention.s4connector.s4.explode_unicode_dn(s4dn)[0])

Return to bug 31083