Attachment 2480 Details for Bug 2272 – Fix Match block overrides failing if global option set

[patch] Fix Match block overrides failing if global option set

0001-Fix-RekeyLimit-PermitTunnel-in-Match-clause-failing-.patch (text/plain), 1.22 KB, created by Sami Hartikainen on 2014-09-24 18:49:22 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Sami Hartikainen

Created: 2014-09-24 18:49:22 AEST

Size: 1.22 KB

patch

obsolete

>From 1430ab10e718f225c67126e1a0f63d526e56b52e Mon Sep 17 00:00:00 2001
>From: Sami Hartikainen <sami.hartikainen@teleste.com>
>Date: Wed, 24 Sep 2014 11:31:36 +0300
>Subject: [PATCH] Fix RekeyLimit, PermitTunnel in Match clause failing to
> override global setting
>
>PermitTunnel [1], RekeyLimit (actually any option using the parse_time)
>override in a Match clause in sshd_config did not work if a global option
>was also set.
>
>  [1] https://bugzilla.mindrot.org/show_bug.cgi?id=2272
>---
> servconf.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/servconf.c b/servconf.c
>index b7f3294..70c2635 100644
>--- a/servconf.c
>+++ b/servconf.c
>@@ -934,7 +934,7 @@ process_server_config_line(ServerOptions *options, char *line,
> 		if ((value = convtime(arg)) == -1)
> 			fatal("%s line %d: invalid time value.",
> 			    filename, linenum);
>-		if (*intptr == -1)
>+		if (*activep && *intptr == -1)
> 			*intptr = value;
> 		break;
> 
>@@ -1497,7 +1497,7 @@ process_server_config_line(ServerOptions *options, char *line,
> 		if (value == -1)
> 			fatal("%s line %d: Bad yes/point-to-point/ethernet/"
> 			    "no argument: %s", filename, linenum, arg);
>-		if (*intptr == -1)
>+		if (*activep && *intptr == -1)
> 			*intptr = value;
> 		break;
> 
>-- 
>1.9.1
>

Actions: View | Diff

Attachments on bug 2272: 2480 | 2614