diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2013-05-23 08:30:30 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2013-05-23 08:30:30 +0800 |
| commit | 71b1527914add38bf5b6b03b640fe1b4f14fe5b8 (patch) | |
| tree | 8af51540c250d182ed9a677cf493b3e4c4d16ac7 /security/openssh-portable | |
| parent | 888404d6c1d7a3758f1841fc9862cc1d21628b7e (diff) | |
| download | freebsd-ports-gnome-71b1527914add38bf5b6b03b640fe1b4f14fe5b8.tar.gz freebsd-ports-gnome-71b1527914add38bf5b6b03b640fe1b4f14fe5b8.tar.zst freebsd-ports-gnome-71b1527914add38bf5b6b03b640fe1b4f14fe5b8.zip | |
- Fix sshd crash when not using HPN
This was due to not including the canohost.h header for our
base customization to respect class login restrictions. I had
missed this as I was only tested with the default (HPN enabled)
which already was including this header.
Reported by: runelind in ##freenode
Tested by: runelind, myself
Reported by: Krzysztof Stryjek
Diffstat (limited to 'security/openssh-portable')
| -rw-r--r-- | security/openssh-portable/Makefile | 3 | ||||
| -rw-r--r-- | security/openssh-portable/files/patch-auth2.c | 16 |
2 files changed, 13 insertions, 6 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 5f6143c88013..736e0e7e750c 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -3,6 +3,7 @@ PORTNAME= openssh DISTVERSION= 6.2p2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= ${MASTER_SITE_OPENBSD} @@ -38,8 +39,6 @@ ETCOLD= ${PREFIX}/etc SUDO?= # empty MAKE_ENV+= SUDO="${SUDO}" -BROKEN= Reports of crashing sshd - OPTIONS_DEFINE= PAM TCP_WRAPPERS LIBEDIT BSM \ HPN LPK X509 \ OVERWRITE_BASE SCTP AES_THREADED diff --git a/security/openssh-portable/files/patch-auth2.c b/security/openssh-portable/files/patch-auth2.c index f94918e9477a..eb8ecef10d36 100644 --- a/security/openssh-portable/files/patch-auth2.c +++ b/security/openssh-portable/files/patch-auth2.c @@ -4,9 +4,17 @@ Changed paths: Apply class-imposed login restrictions. ---- auth2.c.orig 2009-06-22 00:11:07.000000000 -0600 -+++ auth2.c 2010-09-14 16:14:12.000000000 -0600 -@@ -222,6 +221,13 @@ +--- auth2.c.orig 2012-12-02 16:53:20.000000000 -0600 ++++ auth2.c 2013-05-22 17:21:37.979631466 -0500 +@@ -46,6 +46,7 @@ + #include "key.h" + #include "hostfile.h" + #include "auth.h" ++#include "canohost.h" + #include "dispatch.h" + #include "pathnames.h" + #include "buffer.h" +@@ -219,6 +220,13 @@ Authmethod *m = NULL; char *user, *service, *method, *style = NULL; int authenticated = 0; @@ -20,7 +28,7 @@ Apply class-imposed login restrictions. if (authctxt == NULL) fatal("input_userauth_request: no authctxt"); -@@ -274,6 +274,27 @@ +@@ -265,6 +273,27 @@ "(%s,%s) -> (%s,%s)", authctxt->user, authctxt->service, user, service); } |