Index: univention-samba4/samba4-idmap.py
===================================================================
--- univention-samba4/samba4-idmap.py	(Revision 35843)
+++ univention-samba4/samba4-idmap.py	(Arbeitskopie)
@@ -47,6 +47,7 @@
 description='Update local IDmap entries'
 filter='(&(|(objectClass=sambaSamAccount)(objectClass=sambaGroupMapping))(sambaSID=*))'
 attributes=['sambaSID', 'univentionSamba4SID', 'uidNumber', 'gidNumber']
+modrdn='1'
 
 ### Globals
 lp = LoadParm()
@@ -190,7 +191,7 @@
 		univention.debug.debug(univention.debug.LISTENER, univention.debug.ERROR, estr)
 
 
-def handler(dn, new, old):
+def handler(dn, new, old, operation):
 
 	if new:
 		try:
@@ -217,6 +218,9 @@
 			univention.debug.debug(univention.debug.LISTENER, univention.debug.ERROR,
 				"%s: entry for %s could not be updated" % (name, new['sambaSID'][0]) )
 	elif old:
+		if operation == 'r':	## modrdn
+			return
+
 		try:
 			if 'sambaSamAccount' in old['objectClass']:
 				xid_attr = 'uidNumber'