From a56b5fe6e523bd4a050ad9016119f4c1edfe1f64 Mon Sep 17 00:00:00 2001
From: Markus Friedl <markus@cvs.openbsd.org>
Date: Thu, 25 Nov 2004 21:40:47 +0000
Subject: remove special handling of PF_KEY in net_sysctl; ok deraadt

---
 sys/kern/uipc_domain.c | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
index 794b6319c3a..8ff9852bed4 100644
--- a/sys/kern/uipc_domain.c
+++ b/sys/kern/uipc_domain.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_domain.c,v 1.18 2004/09/15 17:46:44 grange Exp $	*/
+/*	$OpenBSD: uipc_domain.c,v 1.19 2004/11/25 21:40:46 markus Exp $	*/
 /*	$NetBSD: uipc_domain.c,v 1.14 1996/02/09 19:00:44 christos Exp $	*/
 
 /*
@@ -192,9 +192,7 @@ net_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
 
 	/*
 	 * All sysctl names at this level are nonterminal.
-	 * PF_KEY: next component is protocol family, and then at least one
-	 *	additional component.
-	 * usually: next two components are protocol family and protocol
+	 * Usually: next two components are protocol family and protocol
 	 *	number, then at least one addition component.
 	 */
 	if (namelen < 2)
@@ -213,20 +211,6 @@ net_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
 #endif
 	return (ENOPROTOOPT);
 found:
-	switch (family) {
-#ifdef IPSEC
-#ifdef __KAME__
-	case PF_KEY:
-		pr = dp->dom_protosw;
-		if (pr->pr_sysctl)
-			return ((*pr->pr_sysctl)(name + 1, namelen - 1,
-				oldp, oldlenp, newp, newlen));
-		return (ENOPROTOOPT);
-#endif
-#endif
-	default:
-		break;
-	}
 	if (namelen < 3)
 		return (EISDIR);		/* overloaded */
 	protocol = name[1];
-- 
cgit v1.2.3