[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  7e6b818fea5 ktutil: Print the numeric enctype if krb5_enctype_to_string() fails
      from  4d44db0208a docs: Add vfs_expand_msdfs manpage

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


- Log -----------------------------------------------------------------
commit 7e6b818fea5541fbedaa68624ca76ebc1fbbf501
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Aug 2 11:21:51 2021 +1200

    ktutil: Print the numeric enctype if krb5_enctype_to_string() fails
    
    Sadly krb5_enctype_to_string() fails when des-cbc-crc encyrption
    type is removed, leaving a failure the operate rather than
    falling back to anything useful.
    
    So fall back to printing 3 in the absense of anything more
    useful.  A future fix could be to hard-code this mapping
    in the smb_krb5_enctype_to_string() wrapper.
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Fri Aug  6 05:53:44 UTC 2021 on sn-devel-184

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

Summary of changes:
 source4/kdc/ktutil.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/kdc/ktutil.c b/source4/kdc/ktutil.c
index 59aa1cf377f..732d247446c 100644
--- a/source4/kdc/ktutil.c
+++ b/source4/kdc/ktutil.c
@@ -96,11 +96,11 @@ int main (int argc, char **argv)
 						 enctype,
 						 &enctype_str);
 		if (ret) {
-			smb_krb5_err(mem_ctx, context, 1, ret, "krb5_enctype_to_string");
+			printf("%s (%d)\n", principal, (int)enctype);
+		} else {
+			printf("%s (%s)\n", principal, enctype_str);
 		}
 
-		printf("%s (%s)\n", principal, enctype_str);
-
 		TALLOC_FREE(principal);
 		SAFE_FREE(enctype_str);
 		smb_krb5_kt_free_entry(context, &entry);


-- 
Samba Shared Repository