Impl for extract_newpw

mistotebe · mistotebe · commit b060d33844e6 · 2019-08-20T11:50:45.000+01:00
diff --git a/Lib/ldap/ldapobject.py b/Lib/ldap/ldapobject.py
@@ -656,13 +656,13 @@ def passwd(self,user,oldpw,newpw,serverctrls=None,clientctrls=None):
         newpw = self._bytesify_input('newpw', newpw)
     return self._ldap_call(self._l.passwd,user,oldpw,newpw,RequestControlTuples(serverctrls),RequestControlTuples(clientctrls))
 
-  def passwd_s(self, user, oldpw, newpw, serverctrls=None, clientctrls=None):
+  def passwd_s(self, user, oldpw, newpw, serverctrls=None, clientctrls=None, extract_newpw=False):
     msgid = self.passwd(user, oldpw, newpw, serverctrls, clientctrls)
     respoid, respvalue = self.extop_result(msgid, all=1, timeout=self.timeout)
 
     if respoid != PasswordModifyResponse.responseName:
       raise ldap.PROTOCOL_ERROR("Unexpected OID %s in extended response!" % respoid)
-    if respvalue:
+    if extract_newpw and respvalue:
       respvalue = PasswordModifyResponse(PasswordModifyResponse.responseName, respvalue)
 
     return respoid, respvalue
diff --git a/Tests/t_ldapobject.py b/Tests/t_ldapobject.py
@@ -697,7 +697,7 @@ def test_passwd_s(self):
             l.passwd_s(dn, "bogus", "ignored")
 
         # have the server generate a new random pw
-        respoid, respvalue = l.passwd_s(dn, "initial", None)
+        respoid, respvalue = l.passwd_s(dn, "initial", None, extract_newpw=True)
         self.assertEqual(respoid, None)
 
         password = respvalue.genPasswd
