From 4d56bc2300180b43e3a9564b8b13b87c505cbcf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Tue, 29 Oct 2002 10:18:00 +0000
Subject: Update for OpenSSH 3.5p1.

---
 secure/lib/libssh/Makefile          | 10 +++++++++-
 secure/libexec/ssh-keysign/Makefile |  1 +
 secure/usr.bin/ssh/Makefile         |  2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index 515dab5aaa6d..8e037119719d 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -8,7 +8,7 @@ SRCS=	authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
 	rsa.c tildexpand.c ttymodes.c xmalloc.c atomicio.c \
 	key.c dispatch.c kex.c mac.c uuencode.c misc.c \
 	rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \
-	scard.c monitor_wrap.c monitor_fdpass.c msg.c
+	scard.c monitor_wrap.c monitor_fdpass.c msg.c xmmap.c
 # Portability layer
 SRCS+=	bsd-misc.c entropy.c
 # FreeBSD additions
@@ -17,6 +17,14 @@ CFLAGS+=-I${SSHDIR}
 
 NOLINT=	true
 
+.if defined(MAKE_KERBEROS4)
+CFLAGS+= -DKRB4
+.endif
+
+.if defined(MAKE_KERBEROS5)
+CFLAGS+= -DKRB5 -DHEIMDAL
+.endif
+
 .if defined(COMPAT_GETADDRINFO)
 SRCS+=	getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c
 .endif
diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile
index 7a21e596cb1f..1f74eacf5f45 100644
--- a/secure/libexec/ssh-keysign/Makefile
+++ b/secure/libexec/ssh-keysign/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	ssh-keysign
+SRCS=	ssh-keysign.c msg.c readconf.c
 MAN=	ssh-keysign.8
 CFLAGS+=-I${SSHDIR}
 .if defined(ENABLE_SUID_SSH)
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 42964ca52b10..204e95a131e6 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -7,7 +7,7 @@ LINKS=	${BINDIR}/ssh ${BINDIR}/slogin
 MAN=	ssh.1 ssh_config.5
 MLINKS=	ssh.1 slogin.1
 
-SRCS=	ssh.c readconf.c clientloop.c sshtty.c \
+SRCS=	ssh.c authfd.c hostfile.c msg.c readconf.c clientloop.c sshtty.c \
 	sshconnect.c sshconnect1.c sshconnect2.c
 
 .if defined(MAKE_KERBEROS4)
-- 
cgit v1.2.3