[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  eb5df255fae s4:libnet: correctly handle gnutls_pbkdf2() errors
       via  53d55836516 s4:libnet: fix error string for failing samr_ChangePasswordUser4()
      from  ac78cb71d69 libads: Save intermediate NULL checks with talloc_asprintf_addbuf()

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


- Log -----------------------------------------------------------------
commit eb5df255faea7326a7b85c1e7ce5a66119a27c3a
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Dec 14 10:37:41 2022 +0100

    s4:libnet: correctly handle gnutls_pbkdf2() errors
    
    We should not ignore the error nor should we map
    GNUTLS_E_UNWANTED_ALGORITHM to NT_STATUS_WRONG_PASSWORD,
    instead we use NT_STATUS_CRYPTO_SYSTEM_INVALID as in most other places
    in the same file.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=15206
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Björn Baumbach <bbaumbach at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Wed Dec 14 13:35:20 UTC 2022 on sn-devel-184

commit 53d558365161be1793dad78ebcce877c732f2419
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Dec 14 10:32:31 2022 +0100

    s4:libnet: fix error string for failing samr_ChangePasswordUser4()
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=15206
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Björn Baumbach <bbaumbach at samba.org>

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

Summary of changes:
 source4/libnet/libnet_passwd.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c
index 8fc4715a209..d7e9400b559 100644
--- a/source4/libnet/libnet_passwd.c
+++ b/source4/libnet/libnet_passwd.c
@@ -81,7 +81,10 @@ static NTSTATUS libnet_ChangePassword_samr_aes(TALLOC_CTX *mem_ctx,
 			   cek.length);
 	BURN_DATA(old_nt_key_data);
 	if (rc < 0) {
-		status = gnutls_error_to_ntstatus(rc, NT_STATUS_WRONG_PASSWORD);
+		status = gnutls_error_to_ntstatus(rc, NT_STATUS_CRYPTO_SYSTEM_INVALID);
+		if (!NT_STATUS_IS_OK(status)) {
+			goto done;
+		}
 	}
 
 	status = init_samr_CryptPasswordAES(mem_ctx,
@@ -105,13 +108,13 @@ static NTSTATUS libnet_ChangePassword_samr_aes(TALLOC_CTX *mem_ctx,
 		goto done;
 	}
 	if (!NT_STATUS_IS_OK(r.out.result)) {
+		status = r.out.result;
 		*error_string = talloc_asprintf(mem_ctx,
 						"samr_ChangePasswordUser4 for "
 						"'%s\\%s' failed: %s",
 						server->string,
 						account->string,
 						nt_errstr(status));
-		status = r.out.result;
 		goto done;
 	}
 


-- 
Samba Shared Repository