diff options
| author |   millert <millert@openbsd.org> | 1998-07-27 18:28:18 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 1998-07-27 18:28:18 +0000 |
| commit | 4e7729afa0db702d27e8e2598ffe788d20c719c7 (patch) | |
| tree | db34b9630516914f652909a166ba9593ace97fd4 | |
| parent | s/comparision/comparison/g; netbsd (diff) | |
| download | wireguard-openbsd-4e7729afa0db702d27e8e2598ffe788d20c719c7.tar.xz wireguard-openbsd-4e7729afa0db702d27e8e2598ffe788d20c719c7.zip | |
use old curses to avoid duplicate symbol in libtelnet
| -rw-r--r-- | libexec/telnetd/Makefile | 7 | ||||
| -rw-r--r-- | libexec/telnetd/telnetd.c | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index ee23868442d..7afdc6dee3d 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 1998/07/24 00:10:50 millert Exp $ +# $OpenBSD: Makefile,v 1.7 1998/07/27 18:28:18 millert Exp $ # from: @(#)Makefile 8.2 (Berkeley) 12/15/93 # $NetBSD: Makefile,v 1.6 1996/02/24 01:22:12 jtk Exp $ @@ -6,10 +6,11 @@ PROG= telnetd CFLAGS+=-DLINEMODE -DKLUDGELINEMODE -DUSE_TERMIO -DDIAGNOSTICS CFLAGS+=-DOLD_ENVIRON -DENV_HACK -I${.CURDIR} -Wall -Wno-unused +CFLAGS+=-D_USE_OLD_CURSES_ SRCS= authenc.c global.c slc.c state.c sys_term.c telnetd.c \ termstat.c utility.c -DPADD= ${LIBUTIL} ${LIBTERM} ${LIBTELNET} -LDADD+= -lutil -lcurses -ltelnet +DPADD= ${LIBUTIL} ${LIBOLDCURSES} ${LIBTELNET} +LDADD+= -lutil -locurses -ltelnet MAN= telnetd.8 .include <bsd.own.mk> # for KERBEROS diff --git a/libexec/telnetd/telnetd.c b/libexec/telnetd/telnetd.c index 455c5300b9b..9f0e6f07548 100644 --- a/libexec/telnetd/telnetd.c +++ b/libexec/telnetd/telnetd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: telnetd.c,v 1.13 1998/07/23 17:55:54 deraadt Exp $ */ +/* $OpenBSD: telnetd.c,v 1.14 1998/07/27 18:28:20 millert Exp $ */ /* $NetBSD: telnetd.c,v 1.6 1996/03/20 04:25:57 tls Exp $ */ /* @@ -45,11 +45,11 @@ static char copyright[] = static char sccsid[] = "@(#)telnetd.c 8.4 (Berkeley) 5/30/95"; static char rcsid[] = "$NetBSD: telnetd.c,v 1.5 1996/02/28 20:38:23 thorpej Exp $"; #else -static char rcsid[] = "$OpenBSD: telnetd.c,v 1.13 1998/07/23 17:55:54 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: telnetd.c,v 1.14 1998/07/27 18:28:20 millert Exp $"; #endif #endif /* not lint */ -#include <term.h> +#include "curses.h" #include "telnetd.h" #include "pathnames.h" |