www/shellinabox: fix ssh command line options

PR: 258838 Reported by: Felix Palmen <felix@palmen-it.de>
freebsd · Oct 13, 2021 · 508036a · 508036a
1 parent c55f38a
commit 508036a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/www/shellinabox/Makefile b/www/shellinabox/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	shellinabox
 PORTVERSION=	2.20
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 
 MAINTAINER=	olivier@FreeBSD.org

diff --git a/www/shellinabox/files/patch-shellinabox_service.c b/www/shellinabox/files/patch-shellinabox_service.c
@@ -1,6 +1,14 @@
---- shellinabox/service.c.orig
+--- shellinabox/service.c.orig	2016-11-09 19:40:33 UTC
 +++ shellinabox/service.c
-@@ -175,8 +175,7 @@ void initService(struct Service *service, const char *
+@@ -169,14 +169,13 @@ void initService(struct Service *service, const char *
+     }
+
+     service->cmdline                        = stringPrintf(NULL,
+-      "ssh -a -e none -i /dev/null -x -oChallengeResponseAuthentication=no "
++      "ssh -a -e none -i /dev/null -x "
+           "-oCheckHostIP=no -oClearAllForwardings=yes -oCompression=no "
+-          "-oControlMaster=no -oGSSAPIAuthentication=no "
++          "-oControlMaster=no "
            "-oHostbasedAuthentication=no -oIdentitiesOnly=yes "
            "-oKbdInteractiveAuthentication=yes -oPasswordAuthentication=yes "
            "-oPreferredAuthentications=keyboard-interactive,password "