Attachment 10395 Details for Bug 51501 – reconnect_set_password_in_ad.patch

[patch] reconnect_set_password_in_ad.patch

reconnect_set_password_in_ad.patch (text/plain), 1.58 KB, created by Arvid Requate on 2020-06-18 13:16:58 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2020-06-18 13:16:58 CEST

Size: 1.58 KB

patch

obsolete

>diff --git a/services/univention-ad-connector/modules/univention/connector/ad/password.py b/services/univention-ad-connector/modules/univention/connector/ad/password.py
>index b2ca5eb0e0..d43b067e7b 100644
>--- /usr/lib/python2.7/dist-packages/univention/connector/ad/password.py.orig
>+++ /usr/lib/python2.7/dist-packages/univention/connector/ad/password.py
>@@ -196,10 +196,15 @@ def calculate_krb5keys(supplementalCredentialsblob):
> 	return keys
> 
> 
>-def set_password_in_ad(connector, samaccountname, pwd):
>+def set_password_in_ad(connector, samaccountname, pwd, reconnect=False):
> 	_d = ud.function('ldap.ad.set_password_in_ad')  # noqa: F841
> 
> 	# print "Static Session Key: %s" % (samr.session_key,)
>+	if reconnect:
>+		if connector.dom_handle:
>+			connector.samr.Close(connector.dom_handle)
>+		connector.samr = None
>+
> 	if not connector.samr:
> 		connector.open_samr()
> 
>@@ -394,7 +399,11 @@ def password_sync_ucs(connector, key, object):
> 	if not pwd == nt_hash:
> 		ud.debug(ud.LDAP, ud.INFO, "password_sync_ucs: Hash AD and Hash UCS differ")
> 		pwd_set = True
>-		res = set_password_in_ad(connector, object['attributes']['sAMAccountName'][0], pwd)
>+		try:
>+			res = set_password_in_ad(connector, object['attributes']['sAMAccountName'][0], pwd)
>+		except Exception as e:
>+			ud.debug(ud.LDAP, ud.PROCESS, "password_sync: set_password_in_ad failed with %s, retry with reconnect" % str(e))
>+			res = set_password_in_ad(connector, object['attributes']['sAMAccountName'][0], pwd, reconnect=True)
> 
> 	if not pwd_set or nt_hash:
> 		newpwdlastset = "-1"  # if pwd was set in ad we need to set pwdlastset to -1 or it will be 0

Actions: View | Diff

Attachments on bug 51501: 10395