Move over -encap change to keywords.sh only made to keywords.h,

$OpenBSD$ tagging.  Added a missing extern specifier. Regenerated keywords.h

3 files changed, 47 insertions, 45 deletions

diff --git a/sbin/route/keywords.c b/sbin/route/keywords.c
index 64d0a42f6ea..330a8c8bfeb 100644
--- a/sbin/route/keywords.c
+++ b/sbin/route/keywords.c
@@ -12,6 +12,7 @@ struct keytab keywords[] = {
 	{"cloning", K_CLONING},
 	{"delete", K_DELETE},
 	{"dst", K_DST},
+	{"encap", K_ENCAP},
 	{"expire", K_EXPIRE},
 	{"flush", K_FLUSH},
 	{"gateway", K_GATEWAY},
@@ -51,7 +52,6 @@ struct keytab keywords[] = {
 	{"x25", K_X25},
 	{"xns", K_XNS},
 	{"xresolve", K_XRESOLVE},
-	{"encap", K_ENCAP}, 
 	{0, 0}
 };
 
diff --git a/sbin/route/keywords.h b/sbin/route/keywords.h
index 18532e05136..6465c45aaf4 100644
--- a/sbin/route/keywords.h
+++ b/sbin/route/keywords.h
@@ -1,8 +1,8 @@
-/* $NetBSD$ */
+/* $OpenBSD: keywords.h,v 1.3 1997/08/26 13:47:47 niklas Exp $ */
 
 /* WARNING!  This file was generated by keywords.sh  */
 
-struct keytab {
+extern struct keytab {
 	char	*kt_cp;
 	int	kt_i;
 } keywords[];
@@ -14,43 +14,43 @@ struct keytab {
 #define	K_CLONING	4
 #define	K_DELETE	5
 #define	K_DST	6
-#define	K_EXPIRE	7
-#define	K_FLUSH	8
-#define	K_GATEWAY	9
-#define	K_GENMASK	10
-#define	K_GET	11
-#define	K_HOST	12
-#define	K_HOPCOUNT	13
-#define	K_IFACE	14
-#define	K_INTERFACE	15
-#define	K_IFA	16
-#define	K_IFP	17
-#define	K_INET	18
-#define	K_IPX	19
-#define	K_ISO	20
-#define	K_LINK	21
-#define	K_LLINFO	22
-#define	K_LOCK	23
-#define	K_LOCKREST	24
-#define	K_MASK	25
-#define	K_MONITOR	26
-#define	K_MTU	27
-#define	K_NET	28
-#define	K_NETMASK	29
-#define	K_NOSTATIC	30
-#define	K_OSI	31
-#define	K_PROTO1	32
-#define	K_PROTO2	33
-#define	K_RECVPIPE	34
-#define	K_REJECT	35
-#define	K_RTT	36
-#define	K_RTTVAR	37
-#define	K_SA	38
-#define	K_SENDPIPE	39
-#define	K_SHOW	40
-#define	K_SSTHRESH	41
-#define	K_STATIC	42
-#define	K_X25	43
-#define	K_XNS	44
-#define	K_XRESOLVE	45
-#define K_ENCAP	46
+#define	K_ENCAP	7
+#define	K_EXPIRE	8
+#define	K_FLUSH	9
+#define	K_GATEWAY	10
+#define	K_GENMASK	11
+#define	K_GET	12
+#define	K_HOST	13
+#define	K_HOPCOUNT	14
+#define	K_IFACE	15
+#define	K_INTERFACE	16
+#define	K_IFA	17
+#define	K_IFP	18
+#define	K_INET	19
+#define	K_IPX	20
+#define	K_ISO	21
+#define	K_LINK	22
+#define	K_LLINFO	23
+#define	K_LOCK	24
+#define	K_LOCKREST	25
+#define	K_MASK	26
+#define	K_MONITOR	27
+#define	K_MTU	28
+#define	K_NET	29
+#define	K_NETMASK	30
+#define	K_NOSTATIC	31
+#define	K_OSI	32
+#define	K_PROTO1	33
+#define	K_PROTO2	34
+#define	K_RECVPIPE	35
+#define	K_REJECT	36
+#define	K_RTT	37
+#define	K_RTTVAR	38
+#define	K_SA	39
+#define	K_SENDPIPE	40
+#define	K_SHOW	41
+#define	K_SSTHRESH	42
+#define	K_STATIC	43
+#define	K_X25	44
+#define	K_XNS	45
+#define	K_XRESOLVE	46
diff --git a/sbin/route/keywords.sh b/sbin/route/keywords.sh
index 354366d8733..09d74041f10 100644
--- a/sbin/route/keywords.sh
+++ b/sbin/route/keywords.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $OpenBSD: keywords.sh,v 1.2 1997/08/26 13:47:47 niklas Exp $
 # $NetBSD: keywords.sh,v 1.2 1996/11/15 18:57:21 gwr Exp $
 # @(#)keywords	8.2 (Berkeley) 3/19/94
 #
@@ -14,6 +15,7 @@ change
 cloning
 delete
 dst
+encap
 expire
 flush
 gateway
@@ -72,11 +74,11 @@ paste _keywords.t1 - > _keywords.t2
 ################################################################
 exec > keywords.h
 
-echo '/* $'NetBSD'$ */
+echo '/* $'OpenBSD'$ */
 
 /* WARNING!  This file was generated by keywords.sh  */
 
-struct keytab {
+extern struct keytab {
 	char	*kt_cp;
 	int	kt_i;
 } keywords[];