[SCM] Samba Shared Repository - branch master updated

Ralph Böhme slow at samba.org
Fri Jul 2 11:46:01 UTC 2021


The branch, master has been updated
       via  edcb095c623 s3:libads: Remove extra new line in keytab list output
      from  b3ee034b4d4 s4:kdc: prefer newer enctypes for preauth responses

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


- Log -----------------------------------------------------------------
commit edcb095c623a72fac049b6b1b2ab96f13c0a3c8a
Author: Pavel Filipenský <pfilipen at redhat.com>
Date:   Fri Jul 2 09:14:18 2021 +0200

    s3:libads: Remove extra new line in keytab list output
    
    net ads keytab list prints extra new line for uknown encoding types,
    so it spans over two lines, instead over a single line:
    
      1  AES-128 CTS mode with 96-bit SHA-1 HMAC     ADDC$@ADDOM.SAMBA.EXAMPLE.COM
      1  UNKNOWN: 3
                                     ADDC$@ADDOM.SAMBA.EXAMPLE.COM
    
    Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Fri Jul  2 11:45:48 UTC 2021 on sn-devel-184

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

Summary of changes:
 source3/libads/kerberos_keytab.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c
index da363741d10..b7e1846bd9f 100644
--- a/source3/libads/kerberos_keytab.c
+++ b/source3/libads/kerberos_keytab.c
@@ -853,7 +853,7 @@ int ads_keytab_list(const char *keytab_name)
 
 		ret = smb_krb5_enctype_to_string(context, enctype, &etype_s);
 		if (ret &&
-		    (asprintf(&etype_s, "UNKNOWN: %d\n", enctype) == -1)) {
+		    (asprintf(&etype_s, "UNKNOWN: %d", enctype) == -1)) {
 			TALLOC_FREE(princ_s);
 			goto out;
 		}


-- 
Samba Shared Repository



More information about the samba-cvs mailing list