diff options
| author | markm <markm@FreeBSD.org> | 2001-08-03 16:03:26 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2001-08-03 16:03:26 +0000 |
| commit | 18d8718070b989bd990856066b78524de0c517d7 (patch) | |
| tree | 94de6e2eac1019debf4189b09078eb1d168b203e /kerberosIV | |
| parent | 07a5285107df49947d1473ff86c0cddd6efceca2 (diff) | |
| download | FreeBSD-src-18d8718070b989bd990856066b78524de0c517d7.zip FreeBSD-src-18d8718070b989bd990856066b78524de0c517d7.tar.gz | |
Revamp and diff-reduce the various secure telnets. Make sure that
Kerberos5 has _a_ telnet (which is not currently K5 enabled).
Incorporate BDE's static linking fixes.
Diffstat (limited to 'kerberosIV')
| -rw-r--r-- | kerberosIV/lib/libtelnet/Makefile | 15 | ||||
| -rw-r--r-- | kerberosIV/libexec/telnetd/Makefile | 11 | ||||
| -rw-r--r-- | kerberosIV/usr.bin/telnet/Makefile | 15 |
3 files changed, 22 insertions, 19 deletions
diff --git a/kerberosIV/lib/libtelnet/Makefile b/kerberosIV/lib/libtelnet/Makefile index 35e936e..d1707ca 100644 --- a/kerberosIV/lib/libtelnet/Makefile +++ b/kerberosIV/lib/libtelnet/Makefile @@ -6,19 +6,20 @@ INTERNALLIB= yes INTERNALSTATICLIB=yes NOPIC= yes -SRCS= genget.c getent.c misc.c encrypt.c auth.c kerberos.c \ - enc_des.c pk.c sra.c +SRCS= genget.c getent.c misc.c encrypt.c auth.c \ + enc_des.c sra.c pk.c +SRCS+= kerberos.c -CFLAGS+= -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \ - -DKRB4 -DSRA -I${TELNETDIR} \ - -I${KRB4DIR}/lib/krb +CFLAGS= -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \ + -DSRA -I${TELNETDIR} +CFLAGS+= -DKRB4 -I${KRB4DIR}/lib/krb -INCS= ${TELNETDIR}/arpa/telnet.h +INCS= ${TELNETDIR}/arpa/telnet.h INCDIR= /usr/include/arpa # # Remove obsolete shared libraries, if any. We don't bother moving them -# to/usr/lib/compat, since they were only used by telnet, telnetd and +# to /usr/lib/compat, since they were only used by telnet, telnetd and # tn3270. # beforeinstall: diff --git a/kerberosIV/libexec/telnetd/Makefile b/kerberosIV/libexec/telnetd/Makefile index 4472990..79f41fa 100644 --- a/kerberosIV/libexec/telnetd/Makefile +++ b/kerberosIV/libexec/telnetd/Makefile @@ -6,17 +6,18 @@ PROG= telnetd MAN= telnetd.8 -CFLAGS+= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \ +CFLAGS= -DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \ -DENV_HACK -DAUTHENTICATION -DENCRYPTION \ -I${TELNETDIR} -DINET6 +CFLAGS+= -DKRB4 SRCS= global.c slc.c state.c sys_term.c telnetd.c \ termstat.c utility.c authenc.c -DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBKRB} \ - ${LIBCRYPT} ${LIBCOM_ERR} ${LIBMP} ${LIBPAM} -LDADD= -lutil -ltermcap ${LIBTELNET} -lcrypto \ - -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp ${MINUSLPAM} +DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \ + ${LIBKRB} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBPAM} +LDADD= -lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \ + -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err ${MINUSLPAM} .include <bsd.prog.mk> diff --git a/kerberosIV/usr.bin/telnet/Makefile b/kerberosIV/usr.bin/telnet/Makefile index 7d331f7..e5d752d 100644 --- a/kerberosIV/usr.bin/telnet/Makefile +++ b/kerberosIV/usr.bin/telnet/Makefile @@ -2,17 +2,18 @@ PROG= telnet -CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \ - -DENCRYPTION -DAUTHENTICATION -DKRB4 \ - -I${TELNETDIR} -DIPSEC -DINET6 +CFLAGS= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \ + -DENCRYPTION -DAUTHENTICATION -DIPSEC -DINET6 \ + -I${TELNETDIR} +CFLAGS+= -DKRB4 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} ${LIBCRYPTO} ${LIBKRB} ${LIBCRYPT} \ - ${LIBCOM_ERR} ${LIBIPSEC} ${LIBPAM} -LDADD= -ltermcap ${LIBTELNET} -lcrypto \ - -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lmp -lipsec ${MINUSLPAM} +DPADD= ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} ${LIBKRB} \ + ${LIBCRYPT} ${LIBCOM_ERR} ${LIBIPSEC} ${LIBPAM} +LDADD= -ltermcap ${LIBTELNET} -lmp -lcrypto \ + -L${KRBOBJDIR} -lkrb -lcrypt -lcom_err -lipsec ${MINUSLPAM} .include <bsd.prog.mk> |
