From 6fdd5473af7032affe8600ab86544e05a4b56456 Mon Sep 17 00:00:00 2001 From: Mark Murray Date: Sat, 27 Oct 2001 12:49:19 +0000 Subject: Diff-reduce these two. Really, one of them needs to disappear. I'll figure out which later. Reported by: bde --- contrib/telnet/arpa/telnet.h | 6 +++--- crypto/telnet/arpa/telnet.h | 6 +++--- include/arpa/telnet.h | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/contrib/telnet/arpa/telnet.h b/contrib/telnet/arpa/telnet.h index b8d3856727b8..af85741e40fa 100644 --- a/contrib/telnet/arpa/telnet.h +++ b/contrib/telnet/arpa/telnet.h @@ -217,8 +217,8 @@ char *telopts[NTELOPTS+1] = { * For backwards compatibility, we define SLC_NAMES to be the * list of names if SLC_NAMES is not defined. */ -#define SLC_NAMELIST "0", "SYNCH", "BRK", "IP", "AO", "AYT", "EOR", \ - "ABORT", "EOF", "SUSP", "EC", "EL", "EW", "RP", \ +#define SLC_NAMELIST "0", "SYNCH", "BRK", "IP", "AO", "AYT", "EOR", \ + "ABORT", "EOF", "SUSP", "EC", "EL", "EW", "RP", \ "LNEXT", "XON", "XOFF", "FORW1", "FORW2", \ "MCL", "MCR", "MCWL", "MCWR", "MCBOL", \ "MCEOL", "INSRT", "OVER", "ECR", "EWR", \ @@ -281,7 +281,7 @@ extern char *slc_names[]; #define AUTHTYPE_KERBEROS_V5 2 #define AUTHTYPE_SPX 3 #define AUTHTYPE_MINK 4 -#define AUTHTYPE_SRA 6 +#define AUTHTYPE_SRA 6 #define AUTHTYPE_CNT 7 #define AUTHTYPE_TEST 99 diff --git a/crypto/telnet/arpa/telnet.h b/crypto/telnet/arpa/telnet.h index b8d3856727b8..af85741e40fa 100644 --- a/crypto/telnet/arpa/telnet.h +++ b/crypto/telnet/arpa/telnet.h @@ -217,8 +217,8 @@ char *telopts[NTELOPTS+1] = { * For backwards compatibility, we define SLC_NAMES to be the * list of names if SLC_NAMES is not defined. */ -#define SLC_NAMELIST "0", "SYNCH", "BRK", "IP", "AO", "AYT", "EOR", \ - "ABORT", "EOF", "SUSP", "EC", "EL", "EW", "RP", \ +#define SLC_NAMELIST "0", "SYNCH", "BRK", "IP", "AO", "AYT", "EOR", \ + "ABORT", "EOF", "SUSP", "EC", "EL", "EW", "RP", \ "LNEXT", "XON", "XOFF", "FORW1", "FORW2", \ "MCL", "MCR", "MCWL", "MCWR", "MCBOL", \ "MCEOL", "INSRT", "OVER", "ECR", "EWR", \ @@ -281,7 +281,7 @@ extern char *slc_names[]; #define AUTHTYPE_KERBEROS_V5 2 #define AUTHTYPE_SPX 3 #define AUTHTYPE_MINK 4 -#define AUTHTYPE_SRA 6 +#define AUTHTYPE_SRA 6 #define AUTHTYPE_CNT 7 #define AUTHTYPE_TEST 99 diff --git a/include/arpa/telnet.h b/include/arpa/telnet.h index bae8d8c3305b..af85741e40fa 100644 --- a/include/arpa/telnet.h +++ b/include/arpa/telnet.h @@ -281,13 +281,14 @@ extern char *slc_names[]; #define AUTHTYPE_KERBEROS_V5 2 #define AUTHTYPE_SPX 3 #define AUTHTYPE_MINK 4 -#define AUTHTYPE_CNT 5 +#define AUTHTYPE_SRA 6 +#define AUTHTYPE_CNT 7 #define AUTHTYPE_TEST 99 #ifdef AUTH_NAMES char *authtype_names[] = { - "NULL", "KERBEROS_V4", "KERBEROS_V5", "SPX", "MINK", + "NULL", "KERBEROS_V4", "KERBEROS_V5", "SPX", "MINK", NULL, "SRA", 0 }; #else -- cgit v1.2.3