Attachment 9758 Details for Bug 35540

[patch] sync_from_ucs_skip_NO_PASSWORD_sambaNTPassword.patch

sync_from_ucs_skip_NO_PASSWORD_sambaNTPassword.patch (text/plain), 1.05 KB, created by Arvid Requate on 2018-11-27 17:20 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2018-11-27 17:20 CET

Size: 1.05 KB

patch

obsolete

>diff --git a/services/univention-s4-connector/modules/univention/s4connector/s4/password.py b/services/univention-s4-connector/modules/univention/s4connector/s4/password.py
>index bcddf3a235..0f50aadfa0 100644
>--- a/services/univention-s4-connector/modules/univention/s4connector/s4/password.py
>+++ b/services/univention-s4-connector/modules/univention/s4connector/s4/password.py
>@@ -588,8 +588,14 @@ def password_sync_ucs_to_s4(s4connector, key, object):
> 			if unicodePwd_attr:
> 				modlist.append((ldap.MOD_DELETE, 'unicodePwd', unicodePwd_attr))
> 			if ucsNThash:
>-				unicodePwd_new = binascii.a2b_hex(ucsNThash)
>-				modlist.append((ldap.MOD_ADD, 'unicodePwd', unicodePwd_new))
>+				try:
>+					unicodePwd_new = binascii.a2b_hex(ucsNThash)
>+					modlist.append((ldap.MOD_ADD, 'unicodePwd', unicodePwd_new))
>+				except TypeError as exc:
>+					if ucsNThash.startswith("NO PASSWORD"):
>+						pass
>+					else:
>+						raise
> 
> 	if not ucsLMhash == s4LMhash:
> 		ud.debug(ud.LDAP, ud.INFO, "password_sync_ucs_to_s4: LM Hash S4: %s LM Hash UCS: %s" % (s4LMhash, ucsLMhash))

Actions: View | Diff

Attachments on bug 35540: 9758