Index: services/univention-ad-connector/modules/univention/connector/__init__.py
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- services/univention-ad-connector/modules/univention/connector/__init__.py	(date 1528898201000)
+++ services/univention-ad-connector/modules/univention/connector/__init__.py	(date 1528902351000)
@@ -1283,7 +1283,7 @@
 								ud.debug(ud.LDAP, ud.WARN, "delete of subobject failed")
 							return False
 
-				return delete_in_ucs(property_type, object, module, position)
+				return self.delete_in_ucs(property_type, object, module, position)
 			elif str(e) == "noObject":  # already deleted #TODO: check if it's really match
 				return True
 			else:
Index: services/univention-ad-connector/modules/univention/connector/ad/__init__.py
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- services/univention-ad-connector/modules/univention/connector/ad/__init__.py	(date 1528898201000)
+++ services/univention-ad-connector/modules/univention/connector/ad/__init__.py	(date 1528902351000)
@@ -499,7 +499,7 @@
 def encode_object_sid(sid_string, encode_in_base64=True):
 	binary_encoding = ""
 
-	for i in sid.split("-")[1:]:
+	for i in sid_string.split("-")[1:]:
 		j = int(i)
 
 		oc1 = (j >> 24)
Index: services/univention-ad-connector/modules/univention/connector/ad/mapping.py
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- services/univention-ad-connector/modules/univention/connector/ad/mapping.py	(date 1528898201000)
+++ services/univention-ad-connector/modules/univention/connector/ad/mapping.py	(date 1528902351000)
@@ -35,7 +35,7 @@
 from univention.config_registry import ConfigRegistry
 import univention.debug2 as ud
 
-from univention.connector.ad import format_escaped
+from univention.connector.ad import format_escaped, decode_sid
 
 baseConfig = ConfigRegistry()
 baseConfig.load()
@@ -82,7 +82,7 @@
 
 def ad2ucs_sid(connector, key, object):
 	_d = ud.function('mapping.ad2ucs_sid')
-	return univention.connector.ad.decode_sid(object['objectSid'])
+	return decode_sid(object['objectSid'])
 
 
 def ucs2ad_givenName(connector, key, object):