Attachment 4732 Details for Bug 26013

[patch] Patch gegen UCS 3.0-2

bug_26013.patch (text/plain), 4.57 KB, created by Arvid Requate on 2012-10-23 12:36 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2012-10-23 12:36 CEST

Size: 4.57 KB

patch

obsolete

>--- /usr/lib/univention-directory-listener/system/samba4-idmap.py.orig	2012-02-09 10:11:27.000000000 +0100
>+++ /usr/lib/univention-directory-listener/system/samba4-idmap.py	2012-10-22 16:31:14.000000000 +0200
>@@ -79,27 +79,32 @@
> 
> 	try:
> 		res = idmap.search('', ldb.SCOPE_SUBTREE, "(&(objectClass=sidMap)(cn=%s))" % old_sambaSID, attrs = ["objectSid", "type"])
>-		record = res.msgs[0]
>-
>-		if record["type"][0] != type_string:
>-			univention.debug.debug(univention.debug.LISTENER, univention.debug.ERROR,
>-				"%s: %s entry type %s does not match object type %s" % (name, old_sambaSID, record["type"][0], type_string) )
>-			univention.debug.debug(univention.debug.LISTENER, univention.debug.ERROR,
>-				"%s: skipping rename of %s to %s" % (name, old_sambaSID, new_sambaSID) )
>-			return False
>+		if not res:
>+			univention.debug.debug(univention.debug.LISTENER, univention.debug.INFO,
>+					"%s: rename_or_modify_idmap_entry: no mapping for objectSid %s, treating as add", (name, old_sambaSID))
>+			add_or_modify_idmap_entry(new_sambaSID, xidNumber, type_string)
>+		else:
>+			record = res.msgs[0]
>+
>+			if record["type"][0] != type_string:
>+				univention.debug.debug(univention.debug.LISTENER, univention.debug.ERROR,
>+					"%s: %s entry type %s does not match object type %s" % (name, old_sambaSID, record["type"][0], type_string) )
>+				univention.debug.debug(univention.debug.LISTENER, univention.debug.ERROR,
>+					"%s: skipping rename of %s to %s" % (name, old_sambaSID, new_sambaSID) )
>+				return False
> 
>-		univention.debug.debug(univention.debug.LISTENER, univention.debug.PROCESS,
>-			"%s: renaming entry for %s to %s" % (name, old_sambaSID, new_sambaSID) )
>+			univention.debug.debug(univention.debug.LISTENER, univention.debug.PROCESS,
>+				"%s: renaming entry for %s to %s" % (name, old_sambaSID, new_sambaSID) )
> 
>-		## try a modrdn
>-		idmap.rename(str(record.dn), "CN=%s" % new_sambaSID)
>-		## and update related attributes
>-		msg = ldb.Message()
>-		msg.dn = ldb.Dn(idmap, "CN=%s" % new_sambaSID)
>-		msg["cn"] = ldb.MessageElement( [ new_sambaSID ] , ldb.FLAG_MOD_REPLACE, "cn")
>-		new_objectSid = ndr_pack(security.dom_sid(new_sambaSID))
>-		msg["objectSid"] = ldb.MessageElement([ new_objectSid ] , ldb.FLAG_MOD_REPLACE, "objectSid")
>-		idmap.modify(msg)
>+			## try a modrdn
>+			idmap.rename(str(record.dn), "CN=%s" % new_sambaSID)
>+			## and update related attributes
>+			msg = ldb.Message()
>+			msg.dn = ldb.Dn(idmap, "CN=%s" % new_sambaSID)
>+			msg["cn"] = ldb.MessageElement( [ new_sambaSID ] , ldb.FLAG_MOD_REPLACE, "cn")
>+			new_objectSid = ndr_pack(security.dom_sid(new_sambaSID))
>+			msg["objectSid"] = ldb.MessageElement([ new_objectSid ] , ldb.FLAG_MOD_REPLACE, "objectSid")
>+			idmap.modify(msg)
> 
> 	except ldb.LdbError, (enum, estr):
> 		univention.debug.debug(univention.debug.LISTENER, univention.debug.WARN, estr)
>@@ -172,19 +177,23 @@
> 
> 	try:
> 		res = idmap.search('', ldb.SCOPE_SUBTREE, "(&(objectClass=sidMap)(cn=%s))" % sambaSID, attrs = ["objectSid", "xidNumber", "type"])
>-		record = res.msgs[0]
>+		if not res:
>+			univention.debug.debug(univention.debug.LISTENER, univention.debug.INFO,
>+					"%s: remove_idmap_entry: no mapping for objectSid %s, skipping", (name, sambaSID))
>+		else:
>+			record = res.msgs[0]
> 
>-		univention.debug.debug(univention.debug.LISTENER, univention.debug.PROCESS,
>-			"%s: removing entry for %s" % (name, sambaSID) )
>+			univention.debug.debug(univention.debug.LISTENER, univention.debug.PROCESS,
>+				"%s: removing entry for %s" % (name, sambaSID) )
> 
>-		idmap.delete(ldb.Dn(idmap, str(record.dn)))
>+			idmap.delete(ldb.Dn(idmap, str(record.dn)))
> 
>-		if record["xidNumber"][0] != str(xidNumber):
>-			univention.debug.debug(univention.debug.LISTENER, univention.debug.WARN,
>-				"%s: removed entry xidNumber %s did not match object xidNumber %s" % (name, record["xidNumber"][0], xidNumber) )
>-		if record["type"][0] != type_string:
>-			univention.debug.debug(univention.debug.LISTENER, univention.debug.WARN,
>-				"%s: removed entry type %s did not match object type %s" % (name, record["type"][0], type_string) )
>+			if record["xidNumber"][0] != str(xidNumber):
>+				univention.debug.debug(univention.debug.LISTENER, univention.debug.WARN,
>+					"%s: removed entry xidNumber %s did not match object xidNumber %s" % (name, record["xidNumber"][0], xidNumber) )
>+			if record["type"][0] != type_string:
>+				univention.debug.debug(univention.debug.LISTENER, univention.debug.WARN,
>+					"%s: removed entry type %s did not match object type %s" % (name, record["type"][0], type_string) )
> 
> 	except ldb.LdbError, (enum, estr):
> 		univention.debug.debug(univention.debug.LISTENER, univention.debug.ERROR, estr)

Actions: View | Diff

Attachments on bug 26013: 4144 | 4145 | 4732