|
 |
c08aa4b |
From 7c9613fac3371cf65fb07739212cdd1ebf6575da Mon Sep 17 00:00:00 2001
|
|
|
c08aa4b |
From: "djm@openbsd.org" <djm@openbsd.org>
|
|
|
c08aa4b |
Date: Wed, 4 Oct 2017 18:49:30 +0000
|
|
|
c08aa4b |
Subject: [PATCH] upstream commit
|
|
|
c08aa4b |
|
|
|
c08aa4b |
fix (another) problem in PermitOpen introduced during the
|
|
|
c08aa4b |
channels.c refactor: the third and subsequent arguments to PermitOpen were
|
|
|
c08aa4b |
being silently ignored; ok markus@
|
|
|
c08aa4b |
|
|
|
c08aa4b |
Upstream-ID: 067c89f1f53cbc381628012ba776d6861e6782fd
|
|
|
c08aa4b |
---
|
|
|
c08aa4b |
servconf.c | 8 ++++----
|
|
|
c08aa4b |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
c08aa4b |
|
|
|
c08aa4b |
diff --git a/servconf.c b/servconf.c
|
|
|
c08aa4b |
index 2c321a4ad..956862959 100644
|
|
|
c08aa4b |
--- a/servconf.c
|
|
|
c08aa4b |
+++ b/servconf.c
|
|
|
c08aa4b |
@@ -1,5 +1,5 @@
|
|
|
c08aa4b |
|
|
|
c08aa4b |
-/* $OpenBSD: servconf.c,v 1.312 2017/10/02 19:33:20 djm Exp $ */
|
|
|
c08aa4b |
+/* $OpenBSD: servconf.c,v 1.313 2017/10/04 18:49:30 djm Exp $ */
|
|
|
c08aa4b |
/*
|
|
|
c08aa4b |
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
|
c08aa4b |
* All rights reserved
|
|
|
c08aa4b |
@@ -1663,9 +1663,9 @@ process_server_config_line(ServerOptions *options, char *line,
|
|
|
c08aa4b |
if (!arg || *arg == '\0')
|
|
|
c08aa4b |
fatal("%s line %d: missing PermitOpen specification",
|
|
|
c08aa4b |
filename, linenum);
|
|
|
c08aa4b |
- i = options->num_permitted_opens; /* modified later */
|
|
|
c08aa4b |
+ value = options->num_permitted_opens; /* modified later */
|
|
|
c08aa4b |
if (strcmp(arg, "any") == 0 || strcmp(arg, "none") == 0) {
|
|
|
c08aa4b |
- if (*activep && i == 0) {
|
|
|
c08aa4b |
+ if (*activep && value == 0) {
|
|
|
c08aa4b |
options->num_permitted_opens = 1;
|
|
|
c08aa4b |
options->permitted_opens = xcalloc(1,
|
|
|
c08aa4b |
sizeof(*options->permitted_opens));
|
|
|
c08aa4b |
@@ -1683,7 +1683,7 @@ process_server_config_line(ServerOptions *options, char *line,
|
|
|
c08aa4b |
if (arg == NULL || ((port = permitopen_port(arg)) < 0))
|
|
|
c08aa4b |
fatal("%s line %d: bad port number in "
|
|
|
c08aa4b |
"PermitOpen", filename, linenum);
|
|
|
c08aa4b |
- if (*activep && i == 0) {
|
|
|
c08aa4b |
+ if (*activep && value == 0) {
|
|
|
c08aa4b |
options->permitted_opens = xrecallocarray(
|
|
|
c08aa4b |
options->permitted_opens,
|
|
|
c08aa4b |
options->num_permitted_opens,
|
|
|
c08aa4b |
|