From: mpi <mpi@openbsd.org>
Date: Wed, 12 Sep 2018 11:24:38 +0000 (+0000)
Subject: Stop exporting TDB counters to userland, this change introduced a
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1cc1f5c47851b8a7ab9a471aae35acacf9ebfd38;p=openbsd

Stop exporting TDB counters to userland, this change introduced a
regression with iked(8).

Reported by Mark Patruck.
---

diff --git a/sys/net/pfkeyv2.c b/sys/net/pfkeyv2.c
index 8e6e3f4990f..31c098f15bf 100644
--- a/sys/net/pfkeyv2.c
+++ b/sys/net/pfkeyv2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfkeyv2.c,v 1.191 2018/08/31 12:55:46 mpi Exp $ */
+/* $OpenBSD: pfkeyv2.c,v 1.192 2018/09/12 11:24:38 mpi Exp $ */
 
 /*
  *	@(#)COPYRIGHT	1.1 (NRL) 17 January 1995
@@ -793,8 +793,7 @@ pfkeyv2_get(struct tdb *tdb, void **headers, void **buffer, int *lenp)
 	void *p;
 
 	/* Find how much space we need */
-	i = sizeof(struct sadb_sa) + sizeof(struct sadb_lifetime) +
-	    sizeof(struct sadb_x_counter);
+	i = sizeof(struct sadb_sa) + sizeof(struct sadb_lifetime);
 
 	if (tdb->tdb_soft_allocations || tdb->tdb_soft_bytes ||
 	    tdb->tdb_soft_timeout || tdb->tdb_soft_first_use)
@@ -956,9 +955,6 @@ pfkeyv2_get(struct tdb *tdb, void **headers, void **buffer, int *lenp)
 	}
 #endif
 
-	headers[SADB_X_EXT_COUNTER] = p;
-	export_counter(&p, tdb);
-
 	rval = 0;
 
  ret: