diff options
| author | tv <tv> | 1998-03-19 02:20:53 +0000 |
|---|---|---|
| committer | tv <tv> | 1998-03-19 02:20:53 +0000 |
| commit | 880dc088dc1b154690be55df8a20c6d581161733 (patch) | |
| tree | 66134cf819f50c669113c2a3559c86d851270b21 | |
| parent | 64927ce43230fb97f7c0f44b84fdaddc465fa085 (diff) | |
| download | pkgsrc-880dc088dc1b154690be55df8a20c6d581161733.tar.gz | |
Chang libwrap support: compile it in for daemon connections, but leave it
out for forwarded connections unless ${LIBWRAP_FWD}=YES at build time.
| -rw-r--r-- | security/ssh/Makefile | 7 | ||||
| -rw-r--r-- | security/ssh/patches/patch-ao | 56 |
2 files changed, 59 insertions, 4 deletions
diff --git a/security/ssh/Makefile b/security/ssh/Makefile index 740cced24d4..759f1ddcde7 100644 --- a/security/ssh/Makefile +++ b/security/ssh/Makefile @@ -3,7 +3,7 @@ # Date created: 19971214 # Whom: hubertf@netbsd.org # -# $NetBSD: Makefile,v 1.14 1998/03/18 03:05:45 tv Exp $ +# $NetBSD: Makefile,v 1.15 1998/03/19 02:20:53 tv Exp $ # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp # @@ -79,6 +79,11 @@ CONFIGURE_ARGS+= --with-socks="-L${PREFIX}/lib -lsocks5" CFLAGS+= -I${PREFIX}/include .endif +# Make libwrap also compare against forwards (off by default) +.if defined(LIBWRAP_FWD) && ${LIBWRAP_FWD} == YES +CFLAGS+= -DLIBWRAP_FWD +.endif + MAN1= scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 \ make-ssh-known-hosts.1 MAN8= sshd.8 diff --git a/security/ssh/patches/patch-ao b/security/ssh/patches/patch-ao index a4a67e43f21..81f3d3591ea 100644 --- a/security/ssh/patches/patch-ao +++ b/security/ssh/patches/patch-ao @@ -1,6 +1,56 @@ -Index: newchannels.c -*** newchannels.c.orig Tue Jan 20 05:24:06 1998 ---- newchannels.c Tue Jan 20 20:42:58 1998 +*** newchannels.c.orig Tue Jan 20 07:24:06 1998 +--- newchannels.c Wed Mar 18 20:44:26 1998 +*************** +*** 241,247 **** + #include "authfd.h" + #include "emulate.h" + #include "servconf.h" +! #ifdef LIBWRAP + #include <tcpd.h> + #include <syslog.h> + #ifdef NEED_SYS_SYSLOG_H +--- 241,247 ---- + #include "authfd.h" + #include "emulate.h" + #include "servconf.h" +! #if defined(LIBWRAP) && defined(LIBWRAP_FWD) + #include <tcpd.h> + #include <syslog.h> + #ifdef NEED_SYS_SYSLOG_H +*************** +*** 881,887 **** + sprintf(buf, "X11 connection from %.200s port %d", + remote_hostname, get_peer_port(newsock)); + xfree(remote_hostname); +! #ifdef LIBWRAP + { + struct request_info req; + struct servent *serv; +--- 881,887 ---- + sprintf(buf, "X11 connection from %.200s port %d", + remote_hostname, get_peer_port(newsock)); + xfree(remote_hostname); +! #if defined(LIBWRAP) && defined(LIBWRAP_FWD) + { + struct request_info req; + struct servent *serv; +*************** +*** 932,938 **** + ch->listening_port, remote_hostname, + get_peer_port(newsock)); + xfree(remote_hostname); +! #ifdef LIBWRAP + { + struct request_info req; + struct servent *serv; +--- 932,938 ---- + ch->listening_port, remote_hostname, + get_peer_port(newsock)); + xfree(remote_hostname); +! #if defined(LIBWRAP) && defined(LIBWRAP_FWD) + { + struct request_info req; + struct servent *serv; *************** *** 2324,2329 **** --- 2324,2333 ---- |