svn commit: r318808 - in head/security/openssh-portable: . files

[Bryan Drewery]

Author: bdrewery
Date: Thu May 23 00:30:30 2013
New Revision: 318808
URL: http://svnweb.freebsd.org/changeset/ports/318808

Log:
  - 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

Modified:
  head/security/openssh-portable/Makefile
  head/security/openssh-portable/files/patch-auth2.c

Modified: head/security/openssh-portable/Makefile
==============================================================================
--- head/security/openssh-portable/Makefile	Thu May 23 00:28:36 2013	(r318807)
+++ head/security/openssh-portable/Makefile	Thu May 23 00:30:30 2013	(r318808)
@@ -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

Modified: head/security/openssh-portable/files/patch-auth2.c
==============================================================================
--- head/security/openssh-portable/files/patch-auth2.c	Thu May 23 00:28:36 2013	(r318807)
+++ head/security/openssh-portable/files/patch-auth2.c	Thu May 23 00:30:30 2013	(r318808)
@@ -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);
  	}