[SCM] Samba Shared Repository - branch master updated

[Gary Lockyer]

The branch, master has been updated
       via  9513d02ef37 python: Correctly re-raise the LdbError if the embedded error is not ldb.ERR_UNWILLING_TO_PERFORM
      from  d701bc15187 libcli ldap tests: remove use of zero length array

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9513d02ef370bb4d1e56459d403a01a7b4c2ea51
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Jun 18 08:39:09 2020 +1200

    python: Correctly re-raise the LdbError if the embedded error is not ldb.ERR_UNWILLING_TO_PERFORM
    
    The current code attempts a SAMR based password set for all errors,
    we want to continue on LDAP or local LDB (in the restore case) unless
    we really got the specific error given by Windows 2000.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14414
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
    Reviewed-by: David Mulder <dmulder at suse.com>
    
    Autobuild-User(master): Gary Lockyer <gary at samba.org>
    Autobuild-Date(master): Tue Jun 23 05:07:00 UTC 2020 on sn-devel-184

-----------------------------------------------------------------------

Summary of changes:
 python/samba/join.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/join.py b/python/samba/join.py
index 20cbab4255c..7273f3734d3 100644
--- a/python/samba/join.py
+++ b/python/samba/join.py
@@ -746,7 +746,7 @@ class DCJoinContext(object):
             except ldb.LdbError as e2:
                 (num, _) = e2.args
                 if num != ldb.ERR_UNWILLING_TO_PERFORM:
-                    pass
+                    raise
                 ctx.net.set_password(account_name=ctx.samname,
                                      domain_name=ctx.domain_name,
                                      newpassword=ctx.acct_pass)


-- 
Samba Shared Repository