diff options
| author | des <des@FreeBSD.org> | 2004-01-08 09:05:24 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-01-08 09:05:24 +0000 |
| commit | f9a1018d27f7f4710d006c8121772fa10b0763bb (patch) | |
| tree | 2da673aa9c65f2735cf9f43fb3e9812a5b4a768a /secure | |
| parent | 343f6ce16b1e2cc4f6fb15825ced63dc2d89dddc (diff) | |
| download | FreeBSD-src-f9a1018d27f7f4710d006c8121772fa10b0763bb.zip FreeBSD-src-f9a1018d27f7f4710d006c8121772fa10b0763bb.tar.gz | |
Enable GSSAPI support. [1]
Also remove some duplicates from ssh's SRCS.
Submitted by: [1] Björn Grönvall <bg@sics.se>
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/lib/libssh/Makefile | 4 | ||||
| -rw-r--r-- | secure/usr.bin/ssh/Makefile | 8 | ||||
| -rw-r--r-- | 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 2acd5cd..46b230a 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 019d4fc..cb142b9 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 f00e415..ec8fe63 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} |
