Attachment 5891 Details for Bug 34742

[patch] Fix univention-pam/well-known-sid-name-mapping.py

347xx_well-known-sid.diff (text/plain), 1.50 KB, created by Philipp Hahn on 2014-05-02 16:46 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2014-05-02 16:46 CEST

Size: 1.50 KB

patch

obsolete

>diff --git a/branches/ucs-3.2/ucs-3.2-1/base/univention-pam/well-known-sid-name-mapping.py b/branches/ucs-3.2/ucs-3.2-1/base/univention-pam/well-known-sid-name-mapping.py
>index c660647..caad7b3 100755
>--- a/branches/ucs-3.2/ucs-3.2-1/base/univention-pam/well-known-sid-name-mapping.py
>+++ b/branches/ucs-3.2/ucs-3.2-1/base/univention-pam/well-known-sid-name-mapping.py
>@@ -46,7 +46,7 @@ import imp
> name = "well-known-sid-name-mapping"
> description = "map user and group names for well known sids"
> filter = "(|(objectClass=sambaSamAccount)(objectClass=sambaGroupMapping))"
>-attributes = ["cn", "sambaSid"]
>+attributes = ["uid", "cn", "sambaSid"]
> FN_CACHE = '/var/cache/univention-directory-listener/well-known-sid-name-mapping_modrdn.pickle'
> modrdn = '1'
> 
>@@ -130,18 +130,16 @@ def no_relevant_change(new, old):
> 		else:
> 			name_attr = 'cn'
> 		
>-		old_name = old.get(name_attr, [None])[0]
>-		new_name = new.get(name_attr, [None])[0]
>+		old_name = old.get(name_attr, [])
>+		new_name = new.get(name_attr, [])
> 
>-		if old_name == new_name:
>-			return True
>-		else:
>-			univention.debug.debug(
>-				univention.debug.LISTENER,
>-				univention.debug.INFO,
>-				"%s: mod %s %s %s" % (name, new.get("sambaSID"), new_name, old_name)
>-			)
>-			return False
>+		univention.debug.debug(
>+			univention.debug.LISTENER,
>+			univention.debug.INFO,
>+			"%s: mod sid=%s new=%r old=%r" % (name, new.get("sambaSID"), new_name, old_name)
>+		)
>+
>+		return set(old_name) == set(new_name)
> 
> def handler(dn, new, old, command):
> 	global modified_default_names

Actions: View | Diff

Attachments on bug 34742: 5891