From 9f80be8e3d87313d7806d2e8ad29a87b04908e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Thu, 8 Jan 2004 09:05:24 +0000 Subject: [PATCH] Enable GSSAPI support. [1] Also remove some duplicates from ssh's SRCS. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Submitted by: [1] Björn Grönvall --- secure/lib/libssh/Makefile | 4 +++- secure/usr.bin/ssh/Makefile | 8 ++++---- secure/usr.sbin/sshd/Makefile | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 2acd5cdda6ee..46b230a83b5d 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -21,7 +21,9 @@ SRCS+= getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c CFLAGS+= -I${SSHDIR} .if !defined(NO_KERBEROS) -CFLAGS+= -DKRB5 -DHEIMDAL +CFLAGS+= -DGSSAPI -DKRB5 -DHEIMDAL +DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN} +LDADD+= -lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken .endif NOLINT= true diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 019d4fc24b56..cb142b9ba10c 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -7,13 +7,13 @@ LINKS= ${BINDIR}/ssh ${BINDIR}/slogin MAN= ssh.1 ssh_config.5 MLINKS= ssh.1 slogin.1 -SRCS= ssh.c authfd.c hostfile.c msg.c readconf.c clientloop.c sshtty.c \ +SRCS= ssh.c readconf.c clientloop.c sshtty.c \ sshconnect.c sshconnect1.c sshconnect2.c .if !defined(NO_KERBEROS) -CFLAGS+= -DKRB5 -DHEIMDAL -LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -lroken -lcrypt -DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN} ${LIBCRYPT} +CFLAGS+= -DGSSAPI -DKRB5 -DHEIMDAL +DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN} +LDADD+= -lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken .endif .if defined(X11BASE) diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index f00e415490fa..ec8fe63a5575 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -17,9 +17,9 @@ MAN= sshd.8 sshd_config.5 CFLAGS+=-I${SSHDIR} .if !defined(NO_KERBEROS) -CFLAGS+= -DKRB5 -DHEIMDAL -DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN} -LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -lroken +CFLAGS+= -DGSSAPI -DKRB5 -DHEIMDAL +DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN} +LDADD+= -lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken .endif DPADD+= ${LIBOPIE} ${LIBMD}