diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2014-10-04 03:23:03 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2014-10-04 03:23:03 +0800 |
| commit | 43583deed27d689204fcb2eecd5fa9468b5d5166 (patch) | |
| tree | 004e3b572b298c1a2fe84d4bfbbdaf6d854171e5 /security/openssh-portable | |
| parent | 1f2a2d1672f92fe279aac3b4d4c07f60a4ed624c (diff) | |
| download | freebsd-ports-gnome-43583deed27d689204fcb2eecd5fa9468b5d5166.tar.gz freebsd-ports-gnome-43583deed27d689204fcb2eecd5fa9468b5d5166.tar.zst freebsd-ports-gnome-43583deed27d689204fcb2eecd5fa9468b5d5166.zip | |
Support multiple ListenAddress ports
Reported by: rustamabd@gmail.com
Diffstat (limited to 'security/openssh-portable')
| -rw-r--r-- | security/openssh-portable/Makefile | 2 | ||||
| -rw-r--r-- | security/openssh-portable/files/openssh.in | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 5e2a15d2da83..f61e60874626 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -3,7 +3,7 @@ PORTNAME= openssh DISTVERSION= 6.6p1 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= ${MASTER_SITE_OPENBSD} diff --git a/security/openssh-portable/files/openssh.in b/security/openssh-portable/files/openssh.in index c05fd1c6a96b..215095098a9f 100644 --- a/security/openssh-portable/files/openssh.in +++ b/security/openssh-portable/files/openssh.in @@ -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() |