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

[Bryan Drewery]

Author: bdrewery
Date: Fri Oct  3 19:23:03 2014
New Revision: 369931
URL: https://svnweb.freebsd.org/changeset/ports/369931
QAT: https://qat.redports.org/buildarchive/r369931/

Log:
  Support multiple ListenAddress ports
  
  Reported by:	rustamabd at gmail.com

Modified:
  head/security/openssh-portable/Makefile
  head/security/openssh-portable/files/openssh.in

Modified: head/security/openssh-portable/Makefile
==============================================================================
--- head/security/openssh-portable/Makefile	Fri Oct  3 18:54:51 2014	(r369930)
+++ head/security/openssh-portable/Makefile	Fri Oct  3 19:23:03 2014	(r369931)
@@ -3,7 +3,7 @@
 
 PORTNAME=	openssh
 DISTVERSION=	6.6p1
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	security ipv6
 MASTER_SITES=	${MASTER_SITE_OPENBSD}

Modified: head/security/openssh-portable/files/openssh.in
==============================================================================
--- head/security/openssh-portable/files/openssh.in	Fri Oct  3 18:54:51 2014	(r369930)
+++ head/security/openssh-portable/files/openssh.in	Fri Oct  3 19:23:03 2014	(r369931)
@@ -144,9 +144,14 @@ openssh_check_same_ports(){
         base_sshd_port=22
     fi
 
-    if [ "${self_port}" -ne "${base_sshd_port}" ]; then 
-        return 1
-    fi
+    # self_port and base_sshd_port may have multiple values. Compare them all
+    for sport in ${self_port}; do
+	    for bport in ${base_sshd_port}; do
+		    [ ${sport} -eq ${bport} ] && return 0
+	    done
+    done
+
+    return 1
 }
 
 openssh_configtest()