Attachment 1220 Details for Bug 1267 – Fix PermitOpen for multiple entries

[patch] Fix PermitOpen for multiple entries

openssh-permitopen.patch (text/plain), 975 bytes, created by Darren Tucker on 2006-12-12 16:39:58 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2006-12-12 16:39:58 AEDT

Size: 975 bytes

patch

obsolete

>Index: servconf.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/servconf.c,v
>retrieving revision 1.165
>diff -u -p -r1.165 servconf.c
>--- servconf.c	14 Aug 2006 12:40:25 -0000	1.165
>+++ servconf.c	12 Dec 2006 05:37:39 -0000
>@@ -1184,6 +1184,9 @@ parse_flag:
> 			}
> 			break;
> 		}
>+		n = options->num_permitted_opens;	/* modified later */
>+		if (*activep && n == -1)
>+			channel_clear_adm_permitted_opens();
> 		for (; arg != NULL && *arg != '\0'; arg = strdelim(&cp)) {
> 			p = hpdelim(&arg);
> 			if (p == NULL)
>@@ -1193,11 +1196,9 @@ parse_flag:
> 			if (arg == NULL || (port = a2port(arg)) == 0)
> 				fatal("%s line %d: bad port number in "
> 				    "PermitOpen", filename, linenum);
>-			if (*activep && options->num_permitted_opens == -1) {
>-				channel_clear_adm_permitted_opens();
>+			if (*activep && n == -1)
> 				options->num_permitted_opens =
> 				    channel_add_adm_permitted_opens(p, port);
>-			}
> 		}
> 		break;
>

Actions: View | Diff

Attachments on bug 1267: 1220