diff options
| author | assar <assar@FreeBSD.org> | 2001-11-01 03:16:03 +0000 |
|---|---|---|
| committer | assar <assar@FreeBSD.org> | 2001-11-01 03:16:03 +0000 |
| commit | 8e6deccca7ce1fa608ca30996b8f4d8cdf1ac33b (patch) | |
| tree | e6a64deca6a06627787ef88366bf58e85fd259df /kerberos5 | |
| parent | c1a5c5318d419a153780d3a0f9e181579b63fc9f (diff) | |
| download | FreeBSD-src-8e6deccca7ce1fa608ca30996b8f4d8cdf1ac33b.zip FreeBSD-src-8e6deccca7ce1fa608ca30996b8f4d8cdf1ac33b.tar.gz | |
make libtelnet (and telnet, telnetd) use libkrb when required
Diffstat (limited to 'kerberos5')
| -rw-r--r-- | kerberos5/lib/libtelnet/Makefile | 5 | ||||
| -rw-r--r-- | kerberos5/libexec/telnetd/Makefile | 12 | ||||
| -rw-r--r-- | kerberos5/usr.bin/telnet/Makefile | 17 |
3 files changed, 30 insertions, 4 deletions
diff --git a/kerberos5/lib/libtelnet/Makefile b/kerberos5/lib/libtelnet/Makefile index 2193678..7dab16f 100644 --- a/kerberos5/lib/libtelnet/Makefile +++ b/kerberos5/lib/libtelnet/Makefile @@ -8,6 +8,11 @@ NOPIC= yes SRCS= genget.c getent.c misc.c encrypt.c auth.c \ enc_des.c sra.c pk.c +.if defined(MAKE_KERBEROS4) +SRCS+= kerberos.c +CFLAGS+= -DKRB4 -I${KRB4DIR}/lib/krb +.endif + #SRCS+= kerberos5.c CFLAGS+= -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \ diff --git a/kerberos5/libexec/telnetd/Makefile b/kerberos5/libexec/telnetd/Makefile index 24e3731..b74910e 100644 --- a/kerberos5/libexec/telnetd/Makefile +++ b/kerberos5/libexec/telnetd/Makefile @@ -13,9 +13,17 @@ CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \ SRCS= global.c slc.c state.c sys_term.c telnetd.c \ termstat.c utility.c authenc.c -DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \ +DPADD= +LDADD= + +.if defined(MAKE_KERBEROS4) +DPADD+= ${LIBKRB} ${LIBCOM_ERR} +LDADD+= -lkrb -lcom_err +.endif + +DPADD+= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \ ${LIBCRYPT} ${LIBPAM} -LDADD= -lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \ +LDADD+= -lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \ -lcrypt ${MINUSLPAM} .include <bsd.prog.mk> diff --git a/kerberos5/usr.bin/telnet/Makefile b/kerberos5/usr.bin/telnet/Makefile index 5c27874..fcec24f 100644 --- a/kerberos5/usr.bin/telnet/Makefile +++ b/kerberos5/usr.bin/telnet/Makefile @@ -5,14 +5,27 @@ PROG= telnet CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOPIE \ -DENCRYPTION -DAUTHENTICATION -DIPSEC -DINET6 \ -I${TELNETDIR} + +.if defined(MAKE_KERBEROS4) +CFLAGS+= -DKRB4 +.endif + #CFLAGS+= -DKRB5 SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \ telnet.c terminal.c tn3270.c utilities.c -DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} \ +DPADD= +LDADD= + +.if defined(MAKE_KERBEROS4) +DPADD+= ${LIBKRB} ${LIBCOM_ERR} +LDADD+= -lkrb -lcom_err +.endif + +DPADD+= ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} \ ${LIBIPSEC} ${LIBPAM} -LDADD= -ltermcap ${LIBTELNET} -lmp -lcrypto -lcrypt \ +LDADD+= -ltermcap ${LIBTELNET} -lmp -lcrypto -lcrypt \ -lipsec ${MINUSLPAM} .include <bsd.prog.mk> |
