Attachment 6909 Details for Bug 31083 – respect dn_attr and dn_attr_val in samaccountname_dn_mapping when looking for S4 object

[patch] respect dn_attr and dn_attr_val in samaccountname_dn_mapping when looking for S4 object

s4__init__.patch (text/plain), 1.28 KB, created by Felix Botner on 2015-05-18 17:35:39 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Felix Botner

Created: 2015-05-18 17:35:39 CEST

Size: 1.28 KB

patch

obsolete

>Index: modules/univention/s4connector/s4/__init__.py
>===================================================================
>--- modules/univention/s4connector/s4/__init__.py	(Revision 60691)
>+++ modules/univention/s4connector/s4/__init__.py	(Arbeitskopie)
>@@ -272,9 +272,12 @@
> 							pass # values are not the same codec
> 								
> 				
>-				ud.debug(ud.LDAP, ud.INFO, "samaccount_dn_mapping: search in s4 samaccountname=%s"%value)
>-				result = s4connector.lo_s4.lo.search_ext_s(s4connector.lo_s4.base,ldap.SCOPE_SUBTREE,
>-								     compatible_modstring('(&(objectclass=%s)(samaccountname=%s))'%(ocs4,value)), ['sAMAccountName'])
>+				filter_s4 = '(objectclass=%s)(samaccountname=%s)' % (ocs4, value)
>+				if dn_attr and dn_attr_val:
>+					filter_s4 = filter_s4 + '(%s=%s)' % (dn_attr, dn_attr_val)
>+				filter_s4 = compatible_modstring('(&%s)' % filter_s4)
>+				ud.debug(ud.LDAP, ud.INFO, "samaccount_dn_mapping: search in s4 %s" % filter_s4)
>+				result = s4connector.lo_s4.lo.search_ext_s(s4connector.lo_s4.base,ldap.SCOPE_SUBTREE, filter_s4, ['sAMAccountName'])
> 				if result and len(result)>0 and result[0] and len(result[0])>0 and result[0][0]: # no referral, so we've got a valid result
> 					s4dn = encode_attrib(result[0][0])
> 					s4pos2 = len(univention.s4connector.s4.explode_unicode_dn(s4dn)[0])

Actions: View | Diff

Attachments on bug 31083: 5176 | 6909