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

(-)a/services/univention-s4-connector/modules/univention/s4connector/s4/__init__.py (-1 / +1 lines)
 Lines 2557-2563   class s4(univention.s4connector.ucs): Link Here 
2557
				ud.debug(ud.LDAP, ud.ALL, "sync_from_ucs: addlist: %s" % addlist)
2557
				ud.debug(ud.LDAP, ud.ALL, "sync_from_ucs: addlist: %s" % addlist)
2558
				try:
2558
				try:
2559
					self.lo_s4.lo.add_ext_s(compatible_modstring(object['dn']), compatible_addlist(addlist), serverctrls=ctrls)  # FIXME encoding
2559
					self.lo_s4.lo.add_ext_s(compatible_modstring(object['dn']), compatible_addlist(addlist), serverctrls=ctrls)  # FIXME encoding
2560
				except ldap.ALREADY_EXISTS as ex:
2560
				except (ldap.ALREADY_EXISTS, ldap.CONSTRAINT_VIOLATION) as ex:
2561
					sAMAccountName = object['attributes'].get('sAMAccountName', [None])[0]
2561
					sAMAccountName = object['attributes'].get('sAMAccountName', [None])[0]
2562
					sambaSID = object['attributes'].get('sambaSID', [None])[0]
2562
					sambaSID = object['attributes'].get('sambaSID', [None])[0]
2563
					if not (sAMAccountName and sambaSID):
2563
					if not (sAMAccountName and sambaSID):

Return to bug 49792