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

(-)a/services/univention-s4-connector/modules/univention/s4connector/s4/__init__.py (-2 / +3 lines)
 Lines 299-305   def samaccountname_dn_mapping(s4connector, given_object, dn_mapping_stored, ucso Link Here 
299
				return False
299
				return False
300
300
301
	for dn_key in ['dn', 'olddn']:
301
	for dn_key in ['dn', 'olddn']:
302
		ud.debug(ud.LDAP, ud.INFO, "samaccount_dn_mapping: check newdn for key %s:" % dn_key)
302
		ud.debug(ud.LDAP, ud.INFO, "samaccount_dn_mapping: check newdn for key %s: %s" % (dn_key, object.get(dn_key)))
303
		if dn_key in object and not dn_premapped(object, dn_key, dn_mapping_stored):
303
		if dn_key in object and not dn_premapped(object, dn_key, dn_mapping_stored):
304
304
305
			dn = object[dn_key]
305
			dn = object[dn_key]
 Lines 354-360   def samaccountname_dn_mapping(s4connector, given_object, dn_mapping_stored, ucso Link Here 
354
					else:
354
					else:
355
						s4_rdn = ldap.dn.str2dn(result[0][0])[0]
355
						s4_rdn = ldap.dn.str2dn(result[0][0])[0]
356
						new_s4_dn = unicode(ldap.dn.dn2str([s4_rdn] + exploded_dn[1:]), 'utf8')
356
						new_s4_dn = unicode(ldap.dn.dn2str([s4_rdn] + exploded_dn[1:]), 'utf8')
357
						newdn = new_s4_dn.lower().replace(s4connector.lo_s4.base.lower(), s4connector.lo.base.lower())
357
						pos = new_s4_dn.lower().rfind(s4connector.lo_s4.base.lower())
358
						newdn = new_s4_dn[:pos] + s4connector.lo.base
358
359
359
				else:
360
				else:
360
					newdn_rdn = [('cn', fst_rdn_value_utf8, ldap.AVA_STRING)]
361
					newdn_rdn = [('cn', fst_rdn_value_utf8, ldap.AVA_STRING)]

Return to bug 46741