diff options
| author | des <des@FreeBSD.org> | 2005-06-07 09:31:28 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2005-06-07 09:31:28 +0000 |
| commit | d78c11891694d603e264051b72f7bfd1374b67a1 (patch) | |
| tree | a0d1ecfa2e0da5d8fc4aeeacef320972cb332bf5 /secure/usr.sbin | |
| parent | a047b79479f72a4c7501f00e3938652abee4b7fd (diff) | |
| download | FreeBSD-src-d78c11891694d603e264051b72f7bfd1374b67a1.zip FreeBSD-src-d78c11891694d603e264051b72f7bfd1374b67a1.tar.gz | |
Revert the commits that made libssh an INTERNALLIB; they caused too much
trouble, especially on amd64.
Requested by: ru
Diffstat (limited to 'secure/usr.sbin')
| -rw-r--r-- | secure/usr.sbin/sshd/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index fef808b..4e73571 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ - -LIBSSH= ${.OBJDIR}/../../lib/libssh/libssh.a +# PROG= sshd SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \ @@ -13,13 +12,16 @@ SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \ auth-krb5.c \ auth2-gss.c gss-serv.c gss-serv-krb5.c \ loginrec.c auth-pam.c auth-shadow.c auth-sia.c md5crypt.c \ - audit.c audit-bsm.c + audit.c audit-bsm.c \ + gss-genr.c + +# gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile MAN= sshd.8 sshd_config.5 CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM} -LDADD= ${LIBSSH} -lutil -lz -lwrap ${MINUSLPAM} +LDADD= -lssh -lutil -lz -lwrap ${MINUSLPAM} .if !defined(NO_KERBEROS) CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL |
