kill kame version symbols and sysctl

ports tree grep run by sthen

4 files changed, 7 insertions, 17 deletions

diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index aff15323264..e8d7a3b0a90 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.3,v 1.226 2013/10/22 16:40:28 guenther Exp $
+.\"	$OpenBSD: sysctl.3,v 1.227 2013/10/28 21:02:35 deraadt Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 22 2013 $
+.Dd $Mdocdate: October 28 2013 $
 .Dt SYSCTL 3
 .Os
 .Sh NAME
@@ -1675,7 +1675,6 @@ The currently defined protocols and names are:
 .It ip6 Ta forwarding Ta integer Ta yes
 .It ip6 Ta hdrnestlimit Ta integer Ta yes
 .It ip6 Ta hlim Ta integer Ta yes
-.It ip6 Ta kame_version Ta string Ta no
 .It ip6 Ta log_interval Ta integer Ta yes
 .It ip6 Ta maxfragpackets Ta integer Ta yes
 .It ip6 Ta maxfrags Ta integer Ta yes
@@ -1829,10 +1828,6 @@ This value applies to all the transport protocols on top of IPv6.
 Methods for overriding this value are documented in
 .Xr ip6 4 .
 .Pp
-.It Li ip6.kame_version
-This string identifies the version of the KAME IPv6 stack implemented
-in the kernel.
-.Pp
 .It Li ip6.log_interval
 This variable permits adjusting the amount of logs generated by the
 IPv6 packet forwarding engine.
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index 61df6263b45..0732216c7e5 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.8,v 1.172 2013/08/14 08:39:30 jmc Exp $
+.\"	$OpenBSD: sysctl.8,v 1.173 2013/10/28 21:02:35 deraadt Exp $
 .\"	$NetBSD: sysctl.8,v 1.4 1995/09/30 07:12:49 thorpej Exp $
 .\"
 .\" Copyright (c) 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)sysctl.8	8.2 (Berkeley) 5/9/95
 .\"
-.Dd $Mdocdate: August 14 2013 $
+.Dd $Mdocdate: October 28 2013 $
 .Dt SYSCTL 8
 .Os
 .Sh NAME
@@ -298,7 +298,6 @@ and a few require a kernel compiled with non-standard
 .It net.inet6.ip6.dad_count Ta integer Ta yes
 .It net.inet6.ip6.auto_flowlabel Ta integer Ta yes
 .It net.inet6.ip6.defmcasthlim Ta integer Ta yes
-.It net.inet6.ip6.kame_version Ta string Ta no
 .It net.inet6.ip6.use_deprecated Ta integer Ta yes
 .It net.inet6.ip6.rr_prune Ta integer Ta yes
 .It net.inet6.ip6.v6only Ta integer Ta no
diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h
index 250b2cd71d3..83ba26eb5cd 100644
--- a/sys/netinet6/in6.h
+++ b/sys/netinet6/in6.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6.h,v 1.68 2013/10/24 11:31:43 mpi Exp $	*/
+/*	$OpenBSD: in6.h,v 1.69 2013/10/28 21:02:35 deraadt Exp $	*/
 /*	$KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $	*/
 
 /*
@@ -74,7 +74,6 @@
  * has the table of implementation/integration differences.
  */
 #define __KAME__
-#define __KAME_VERSION		"OpenBSD-current"
 
 /*
  * IPv6 address
@@ -593,7 +592,6 @@ ifatoia6(struct ifaddr *ifa)
 #define IPV6CTL_DAD_COUNT	16
 #define IPV6CTL_AUTO_FLOWLABEL	17
 #define IPV6CTL_DEFMCASTHLIM	18
-#define IPV6CTL_KAME_VERSION	20
 #define IPV6CTL_USE_DEPRECATED	21	/* use deprecated addr (RFC2462 5.5.4) */
 #define IPV6CTL_RR_PRUNE	22	/* walk timer for router renumbering */
 #define IPV6CTL_V6ONLY		24
@@ -634,7 +632,7 @@ ifatoia6(struct ifaddr *ifa)
 	{ "auto_flowlabel", CTLTYPE_INT }, \
 	{ "defmcasthlim", CTLTYPE_INT }, \
 	{ 0, 0 }, \
-	{ "kame_version", CTLTYPE_STRING }, \
+	{ 0, 0 }, \
 	{ "use_deprecated", CTLTYPE_INT }, \
 	{ "rr_prune", CTLTYPE_INT }, \
 	{ 0, 0 }, \
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 068218e4f1b..400a1b9bc56 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_input.c,v 1.118 2013/10/23 19:57:50 deraadt Exp $	*/
+/*	$OpenBSD: ip6_input.c,v 1.119 2013/10/28 21:02:35 deraadt Exp $	*/
 /*	$KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $	*/
 
 /*
@@ -1363,8 +1363,6 @@ ip6_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp,
 		return ENOTDIR;
 
 	switch (name[0]) {
-	case IPV6CTL_KAME_VERSION:
-		return sysctl_rdstring(oldp, oldlenp, newp, __KAME_VERSION);
 	case IPV6CTL_V6ONLY:
 		return sysctl_rdint(oldp, oldlenp, newp, ip6_v6only);
 	case IPV6CTL_DAD_PENDING: