From fe0984e07bb48922acae5a4993503455df9dec0d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20M=C3=BCller?= Date: Mon, 21 Dec 2020 21:55:43 +0100 Subject: [PATCH] sshctrl: when enable or disable AllowTcpForwarding, change PermitOpen accordingly MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes: #12546 Signed-off-by: Peter Müller Signed-off-by: Michael Tremer --- src/misc-progs/sshctrl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/misc-progs/sshctrl.c b/src/misc-progs/sshctrl.c index f855c5a4a7..6e8652c842 100644 --- a/src/misc-progs/sshctrl.c +++ b/src/misc-progs/sshctrl.c @@ -67,10 +67,10 @@ int main(int argc, char *argv[]) strlcat(command, "s/^PasswordAuthentication .*$/PasswordAuthentication yes/;", STRING_SIZE - 1 ); if(findkey(kv, "ENABLE_SSH_PORTFW", buffer) && !strcmp(buffer,"on")) - strlcat(command, "s/^AllowTcpForwarding .*$/AllowTcpForwarding yes/;", STRING_SIZE - 1 ); + strlcat(command, "s/^AllowTcpForwarding .*$/AllowTcpForwarding yes/;" "s/^PermitOpen .*$/PermitOpen any/;", STRING_SIZE - 1 ); else - strlcat(command, "s/^AllowTcpForwarding .*$/AllowTcpForwarding no/;", STRING_SIZE - 1 ); - + strlcat(command, "s/^AllowTcpForwarding .*$/AllowTcpForwarding no/;" "s/^PermitOpen .*$/PermitOpen none/;", STRING_SIZE - 1 ); + if(findkey(kv, "SSH_PORT", buffer) && !strcmp(buffer,"on")) strlcat(command, "s/^Port .*$/Port 22/;", STRING_SIZE - 1 ); else -- 2.39.5