From 7834e79334f23778465fe2ed31ae644469e3092b Mon Sep 17 00:00:00 2001
From: zrj <rimvydas.jasinskas@gmail.com>
Date: Wed, 17 Apr 2019 05:15:30 +0300
Subject: [PATCH] telnet(1): Disable use of OPIE.

Move <sys/wait.h> it is needed for another call site.
---
 usr.bin/telnet/Makefile   | 2 +-
 usr.bin/telnet/commands.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index d3b1f9c4df..9d141c1b49 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -5,7 +5,7 @@ PROG=		telnet
 SRCS=		authenc.c commands.c main.c network.c ring.c sys_bsd.c \
 		telnet.c terminal.c utilities.c
 
-CFLAGS+=	-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOPIE \
+CFLAGS+=	-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK \
 		-I${.CURDIR}/../../lib -I${.CURDIR}/../../lib/libtelnet
 WARNS?=		2
 NO_STRICT_ALIASING=
diff --git a/usr.bin/telnet/commands.c b/usr.bin/telnet/commands.c
index a41bfc74f5..e65a5e28a5 100644
--- a/usr.bin/telnet/commands.c
+++ b/usr.bin/telnet/commands.c
@@ -34,6 +34,7 @@
 #include <sys/un.h>
 #include <sys/file.h>
 #include <sys/socket.h>
+#include <sys/wait.h>
 #include <netinet/in.h>
 
 #include <ctype.h>
@@ -118,7 +119,6 @@ static int margc;
 static char *margv[20];
 
 #ifdef OPIE
-#include <sys/wait.h>
 #define PATH_OPIEKEY	"/usr/bin/opiekey"
 static int
 opie_calc(int argc, char *argv[])
-- 
2.11.4.GIT