Attachment 14246 Details for Bug 11573 – Fix for 11573, cherry-picked from master

[patch] Fix for 11573, cherry-picked from master

0001-heimdal-lib-krb5-do-not-fail-set_config_files-due-to.patch (text/plain), 2.57 KB, created by Björn Baumbach on 2018-06-20 09:15:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Baumbach

Created: 2018-06-20 09:15:45 UTC

Size: 2.57 KB

patch

obsolete

>From 7a517150c76326b4a4bcc82edf2d245608db1526 Mon Sep 17 00:00:00 2001
>From: Jeffrey Altman <jaltman@secure-endpoints.com>
>Date: Thu, 16 Jun 2016 16:25:41 -0400
>Subject: [PATCH] heimdal: lib/krb5: do not fail set_config_files due to parse
> error
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Follow Apple's lead and do not fail krb5_set_config_files() simply
>because one of the files in the profile list fails to parse correctly.
>Doing so can lead to hard to find failures and could lead to an end
>user shooting themselves in the foot and no longer be able to login
>to their system to fix it.
>
>Parse as many of the files as we can.  Only fail krb5_set_config_files()
>if init_context_from_config_file() fails.
>
>Change-Id: I122664c6d707a5f926643808ba414bf4f681f8b8
>
>Cherry-pick of Heimdal commit b7cf5e7caf9b270f4d4151d2690177b11a7a1bdf
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11573
>
>Signed-off-by: BjÃ¶rn Baumbach <bb@sernet.de>
>Reviewed-by: Alexander Bokovoy <ab@samba.org>
>(cherry picked from commit f05a1554b770c6a2c905170347bfb41157f4aa78)
>---
> source4/heimdal/lib/krb5/config_file.c | 4 ++--
> source4/heimdal/lib/krb5/context.c     | 3 ++-
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/source4/heimdal/lib/krb5/config_file.c b/source4/heimdal/lib/krb5/config_file.c
>index 4ac25ae2870..f5ddcc93e72 100644
>--- a/source4/heimdal/lib/krb5/config_file.c
>+++ b/source4/heimdal/lib/krb5/config_file.c
>@@ -370,11 +370,11 @@ krb5_config_parse_debug (struct fileptr *f,
> 	    b = NULL;
> 	} else if (*p == '}') {
> 	    *err_message = "unmatched }";
>-	    return EINVAL;	/* XXX */
>+	    return KRB5_CONFIG_BADFORMAT;
> 	} else if(*p != '\0') {
> 	    if (s == NULL) {
> 		*err_message = "binding before section";
>-		return EINVAL;
>+		return KRB5_CONFIG_BADFORMAT;
> 	    }
> 	    ret = parse_binding(f, lineno, p, &b, &s->u.list, err_message);
> 	    if (ret)
>diff --git a/source4/heimdal/lib/krb5/context.c b/source4/heimdal/lib/krb5/context.c
>index 23e3879d6db..770f01278a1 100644
>--- a/source4/heimdal/lib/krb5/context.c
>+++ b/source4/heimdal/lib/krb5/context.c
>@@ -646,7 +646,8 @@ krb5_set_config_files(krb5_context context, char **filenames)
>     krb5_config_binding *tmp = NULL;
>     while(filenames != NULL && *filenames != NULL && **filenames != '\0') {
> 	ret = krb5_config_parse_file_multi(context, *filenames, &tmp);
>-	if(ret != 0 && ret != ENOENT && ret != EACCES && ret != EPERM) {
>+	if (ret != 0 && ret != ENOENT && ret != EACCES && ret != EPERM
>+	    && ret != KRB5_CONFIG_BADFORMAT) {
> 	    krb5_config_file_free(context, tmp);
> 	    return ret;
> 	}
>-- 
>2.16.1
>

Flags:

abartlet: review+

Actions: View

Attachments on bug 11573: 11593 | 13809 | 13810 | 13819 | 13820 | 14239 | 14246