tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream commit

Browse Source 
fix (another) problem in PermitOpen introduced during the
channels.c refactor: the third and subsequent arguments to PermitOpen were
being silently ignored; ok markus@

Upstream-ID: 067c89f1f53cbc381628012ba776d6861e6782fd
This commit is contained in:
djm@openbsd.org 2017-10-04 18:49:30 +00:00 committed by Damien Miller
parent 66bf74a921
commit 69bda02288
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servconf.c
View File

@ -1,5 +1,5 @@
/* $OpenBSD: servconf.c,v 1.312 2017/10/02 19:33:20 djm Exp $ */ /* $OpenBSD: servconf.c,v 1.313 2017/10/04 18:49:30 djm Exp $ */
/* /*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -1663,9 +1663,9 @@ process_server_config_line(ServerOptions *options, char *line,
if (!arg || *arg == '\0') if (!arg || *arg == '\0')
fatal("%s line %d: missing PermitOpen specification", fatal("%s line %d: missing PermitOpen specification",
filename, linenum); filename, linenum);
i = options->num_permitted_opens; /* modified later */ value = options->num_permitted_opens; /* modified later */
if (strcmp(arg, "any") == 0 || strcmp(arg, "none") == 0) { if (strcmp(arg, "any") == 0 || strcmp(arg, "none") == 0) {
if (*activep && i == 0) { if (*activep && value == 0) {
options->num_permitted_opens = 1; options->num_permitted_opens = 1;
options->permitted_opens = xcalloc(1, options->permitted_opens = xcalloc(1,
sizeof(*options->permitted_opens)); sizeof(*options->permitted_opens));
@ -1683,7 +1683,7 @@ process_server_config_line(ServerOptions *options, char *line,
if (arg == NULL || ((port = permitopen_port(arg)) < 0)) if (arg == NULL || ((port = permitopen_port(arg)) < 0))
fatal("%s line %d: bad port number in " fatal("%s line %d: bad port number in "
"PermitOpen", filename, linenum); "PermitOpen", filename, linenum);
if (*activep && i == 0) { if (*activep && value == 0) {
options->permitted_opens = xrecallocarray( options->permitted_opens = xrecallocarray(
options->permitted_opens, options->permitted_opens,
options->num_permitted_opens, options->num_permitted_opens,