[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  5094d986b76 lib/krb5_wrap: Fix missing error check in new salt code
      from  5eeb441b771 dsdb: Allow special chars like "@" in samAccountName when generating the salt

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


- Log -----------------------------------------------------------------
commit 5094d986b7686f057195dcb10764295b88967019
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Oct 22 10:50:36 2021 +1300

    lib/krb5_wrap: Fix missing error check in new salt code
    
    CID 1492905: Control flow issues  (DEADCODE)
    
    This was a regression in 5eeb441b771a1ffe1ba1c69b72e8795f525a58ed.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14874
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Sat Oct 23 08:07:13 UTC 2021 on sn-devel-184

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

Summary of changes:
 lib/krb5_wrap/krb5_samba.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 63a6e951f80..fff5b4e2a22 100644
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -594,9 +594,9 @@ int smb_krb5_salt_principal(krb5_context krb5_ctx,
 		 * No matter what realm (including none) in the UPN,
 		 * the realm is replaced with our upper-case realm
 		 */
-		smb_krb5_principal_set_realm(krb5_ctx,
-					     *salt_princ,
-					     upper_realm);
+		krb5_ret = smb_krb5_principal_set_realm(krb5_ctx,
+							*salt_princ,
+							upper_realm);
 		if (krb5_ret != 0) {
 			krb5_free_principal(krb5_ctx, *salt_princ);
 			TALLOC_FREE(frame);


-- 
Samba Shared Repository