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 /secure | |
| 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 'secure')
| -rw-r--r-- | secure/lib/Makefile | 2 | ||||
| -rw-r--r-- | secure/lib/libtelnet/Makefile | 4 | ||||
| -rw-r--r-- | secure/libexec/Makefile | 2 | ||||
| -rw-r--r-- | secure/usr.bin/telnet/Makefile | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/secure/lib/Makefile b/secure/lib/Makefile index a3aa74c..a6f15de 100644 --- a/secure/lib/Makefile +++ b/secure/lib/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ SUBDIR= libcipher -.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) +.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(MAKE_KERBEROS5) SUBDIR+=libtelnet .endif .if !defined(NO_OPENSSL) diff --git a/secure/lib/libtelnet/Makefile b/secure/lib/libtelnet/Makefile index 4eda977..c19cfb8 100644 --- a/secure/lib/libtelnet/Makefile +++ b/secure/lib/libtelnet/Makefile @@ -9,8 +9,8 @@ NOPIC= yes SRCS= genget.c getent.c misc.c encrypt.c auth.c \ enc_des.c sra.c pk.c -CFLAGS+= -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \ - -DSRA -I${TELNETDIR} +CFLAGS= -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \ + -DSRA -I${TELNETDIR} INCS= ${TELNETDIR}/arpa/telnet.h INCDIR= /usr/include/arpa diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile index c5992e6..cd8405b 100644 --- a/secure/libexec/Makefile +++ b/secure/libexec/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(MAKE_KERBEROS4) && !defined(MAKE_KERBEROS5) && !defined(NO_OPENSSL) SUBDIR= telnetd .endif .if !defined(NO_OPENSSL) && !defined(NO_OPENSSH) diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile index 56f7a7e..f5fe199 100644 --- a/secure/usr.bin/telnet/Makefile +++ b/secure/usr.bin/telnet/Makefile @@ -2,9 +2,9 @@ PROG= telnet -CFLAGS+= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \ - -DENCRYPTION -DAUTHENTICATION -I${TELNETDIR} -CFLAGS+= -DIPSEC -DINET6 +CFLAGS= -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \ + -DENCRYPTION -DAUTHENTICATION -DIPSEC -DINET6 \ + -I${TELNETDIR} SRCS= authenc.c commands.c main.c network.c ring.c sys_bsd.c \ telnet.c terminal.c tn3270.c utilities.c |
