further PPP reduction, hint from sthen

4 files changed, 5 insertions, 18 deletions

diff --git a/libexec/getty/gettytab.5 b/libexec/getty/gettytab.5
index bb6b8f8fa21..b277005c86c 100644
--- a/libexec/getty/gettytab.5
+++ b/libexec/getty/gettytab.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gettytab.5,v 1.25 2015/07/18 09:35:05 jmc Exp $
+.\"	$OpenBSD: gettytab.5,v 1.26 2015/11/06 16:42:30 tedu Exp $
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -28,7 +28,7 @@
 .\"
 .\"     from: @(#)gettytab.5	8.4 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: July 18 2015 $
+.Dd $Mdocdate: November 6 2015 $
 .Dt GETTYTAB 5
 .Os
 .Sh NAME
@@ -127,7 +127,6 @@ hangup line on last close.
 .It pe Ta bool Ta false Ta "Use printer (hard copy) erase algorithm."
 .It pf Ta num Ta 0 Ta "Delay"
 between first prompt and following flush (seconds).
-.It pp Ta str Ta unused Ta "PPP authentication program."
 .It ps Ta bool Ta false Ta "Line connected to a MICOM port selector."
 .It qu Ta str Ta So Li \&^\e Sc Ta "Quit character."
 .It rp Ta str Ta So Li ^R Sc Ta "Line retype character."
diff --git a/libexec/getty/gettytab.h b/libexec/getty/gettytab.h
index 1decf65c557..cba986c052d 100644
--- a/libexec/getty/gettytab.h
+++ b/libexec/getty/gettytab.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gettytab.h,v 1.7 2013/12/10 20:56:59 naddy Exp $*/
+/*	$OpenBSD: gettytab.h,v 1.8 2015/11/06 16:42:30 tedu Exp $*/
 
 /*
  * Copyright (c) 1983, 1993, 1994
@@ -82,7 +82,6 @@ struct gettyflags {
 #define FL	gettystrs[21].value
 #define WE	gettystrs[22].value
 #define LN	gettystrs[23].value
-#define PP	gettystrs[24].value
 
 /*
  * Numeric definitions.
diff --git a/libexec/getty/init.c b/libexec/getty/init.c
index 2e36cb2a330..d5d0aea90e8 100644
--- a/libexec/getty/init.c
+++ b/libexec/getty/init.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init.c,v 1.9 2013/12/10 20:56:59 naddy Exp $	*/
+/*	$OpenBSD: init.c,v 1.10 2015/11/06 16:42:30 tedu Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -66,7 +66,6 @@ struct	gettystrs gettystrs[] = {
 	{ "fl", &tmode.c_cc[VDISCARD] },/* flush output */
 	{ "we", &tmode.c_cc[VWERASE] },	/* word erase */
 	{ "ln", &tmode.c_cc[VLNEXT] },	/* literal next */
-	{ "pp" },			/* ppp login program */
 	{ 0 }
 };
 
diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index f08fb459631..e0f641aa85e 100644
--- a/libexec/getty/main.c
+++ b/libexec/getty/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.39 2015/11/06 16:39:53 tedu Exp $	*/
+/*	$OpenBSD: main.c,v 1.40 2015/11/06 16:42:30 tedu Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1993
@@ -57,16 +57,6 @@
  */
 #define GETTY_TIMEOUT	60 /* seconds */
 
-/* defines for auto detection of incoming PPP calls (->PAP/CHAP) */
-
-#define PPP_FRAME	    0x7e  /* PPP Framing character */
-#define PPP_STATION	    0xff  /* "All Station" character */
-#define PPP_ESCAPE	    0x7d  /* Escape Character */
-#define PPP_CONTROL	    0x03  /* PPP Control Field */
-#define PPP_CONTROL_ESCAPED 0x23  /* PPP Control Field, escaped */
-#define PPP_LCP_HI	    0xc0  /* LCP protocol - high byte */
-#define PPP_LCP_LOW	    0x21  /* LCP protocol - low byte */
-
 struct termios tmode, omode;
 
 int crmod, digit, lower, upper;