Attachment 2564 Details for Bug 2288 – make config parser more consistent

[patch] make config parser more consistent

AuthorizedPrincipalsFile.patch (text/plain), 993 bytes, created by Jakub Jelen on 2015-03-07 02:14:29 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Jelen

Created: 2015-03-07 02:14:29 AEDT

Size: 993 bytes

patch

obsolete

>diff --git a/auth.c b/auth.c
>index f9b7673..7d3a72b 100644
>--- a/auth.c
>+++ b/auth.c
>@@ -400,8 +400,7 @@ expand_authorized_keys(const char *filename, struct passwd *pw)
> char *
> authorized_principals_file(struct passwd *pw)
> {
>-	if (options.authorized_principals_file == NULL ||
>-	    strcasecmp(options.authorized_principals_file, "none") == 0)
>+	if (options.authorized_principals_file == NULL)
> 		return NULL;
> 	return expand_authorized_keys(options.authorized_principals_file, pw);
> }
>diff --git a/servconf.c b/servconf.c
>index 3185462..9d2adeb 100644
>--- a/servconf.c
>+++ b/servconf.c
>@@ -349,6 +349,7 @@ fill_default_server_options(ServerOptions *options)
> 	CLEAR_ON_NONE(options->banner);
> 	CLEAR_ON_NONE(options->trusted_user_ca_keys);
> 	CLEAR_ON_NONE(options->revoked_keys_file);
>+	CLEAR_ON_NONE(options->authorized_principals_file);
> 	for (i = 0; i < options->num_host_key_files; i++)
> 		CLEAR_ON_NONE(options->host_key_files[i]);
> 	for (i = 0; i < options->num_host_cert_files; i++)

Flags:

dtucker: ok+

Actions: View | Diff

Attachments on bug 2288: 2564