summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2002-01-23 01:33:08 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2002-01-23 01:33:08 +0000
commit1a2247bc55afb9ab58997e179e77d2388a3a5cb5 (patch)
tree244878cc0fc4f9b7e700f41c9fc756d47ade0e38 /sys
parent7622411bdd8967c439a75acb85a78161c5805702 (diff)
It looks like there has been one crack smoking and a few cut and pastes.
PR_FREEHEADER should not be set in pool_init by the caller. It shouldn't be set in pool_init at all. Besides, it's going away soon anyway.
Diffstat (limited to 'sys')
-rw-r--r--sys/crypto/crypto.c6
-rw-r--r--sys/net/pfkeyv2.c4
-rw-r--r--sys/netinet/ip_spd.c6
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/crypto/crypto.c b/sys/crypto/crypto.c
index caf09bbde2f..836984d1d65 100644
--- a/sys/crypto/crypto.c
+++ b/sys/crypto/crypto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crypto.c,v 1.31 2002/01/23 00:39:47 art Exp $ */
+/* $OpenBSD: crypto.c,v 1.32 2002/01/23 01:33:07 art Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
*
@@ -412,9 +412,9 @@ crypto_getreq(int num)
if (crypto_pool_initialized == 0) {
pool_init(&cryptop_pool, sizeof(struct cryptop), 0, 0,
- PR_FREEHEADER, "cryptop", NULL);
+ 0, "cryptop", NULL);
pool_init(&cryptodesc_pool, sizeof(struct cryptodesc), 0, 0,
- PR_FREEHEADER, "cryptodesc", NULL);
+ 0, "cryptodesc", NULL);
crypto_pool_initialized = 1;
}
diff --git a/sys/net/pfkeyv2.c b/sys/net/pfkeyv2.c
index 7dac1fb3b11..7e86e416753 100644
--- a/sys/net/pfkeyv2.c
+++ b/sys/net/pfkeyv2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfkeyv2.c,v 1.78 2002/01/23 00:39:48 art Exp $ */
+/* $OpenBSD: pfkeyv2.c,v 1.79 2002/01/23 01:33:07 art Exp $ */
/*
* @(#)COPYRIGHT 1.1 (NRL) 17 January 1995
@@ -1543,7 +1543,7 @@ pfkeyv2_send(struct socket *socket, void *message, int len)
{
ipsec_policy_pool_initialized = 1;
pool_init(&ipsec_policy_pool, sizeof(struct ipsec_policy),
- 0, 0, PR_FREEHEADER, "ipsec policy", NULL);
+ 0, 0, 0, "ipsec policy", NULL);
}
/* Allocate policy entry */
diff --git a/sys/netinet/ip_spd.c b/sys/netinet/ip_spd.c
index 0ec0ed825b4..68226b58bb3 100644
--- a/sys/netinet/ip_spd.c
+++ b/sys/netinet/ip_spd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_spd.c,v 1.42 2002/01/23 00:39:48 art Exp $ */
+/* $OpenBSD: ip_spd.c,v 1.43 2002/01/23 01:33:07 art Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
*
@@ -615,7 +615,7 @@ ipsec_add_policy(struct sockaddr_encap *dst, struct sockaddr_encap *mask,
if (ipsec_policy_pool_initialized == 0) {
ipsec_policy_pool_initialized = 1;
pool_init(&ipsec_policy_pool, sizeof(struct ipsec_policy),
- 0, 0, PR_FREEHEADER, "ipsec policy", NULL);
+ 0, 0, 0, "ipsec policy", NULL);
}
ipon = pool_get(&ipsec_policy_pool, 0);
@@ -707,7 +707,7 @@ ipsp_acquire_sa(struct ipsec_policy *ipo, union sockaddr_union *gw,
if (ipsec_acquire_pool_initialized == 0) {
ipsec_acquire_pool_initialized = 1;
pool_init(&ipsec_acquire_pool, sizeof(struct ipsec_acquire),
- 0, 0, PR_FREEHEADER, "ipsec acquire", NULL);
+ 0, 0, 0, "ipsec acquire", NULL);
}
ipa = pool_get(&ipsec_acquire_pool, 0);