summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2001-08-23 16:56:47 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2001-08-23 16:56:47 +0000
commit606f14b8ba28859679b4e31d00f6b0c3085ec604 (patch)
tree2e129c678d7bd2527df27694c635798e4907ba66
parent08b8f81d1a852fd284eab1cb3299706c324fad0a (diff)
ignore EEXIST for SPDADD on KAME; ok ho@
-rw-r--r--sbin/isakmpd/pf_key_v2.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sbin/isakmpd/pf_key_v2.c b/sbin/isakmpd/pf_key_v2.c
index 58dbc18f02a..36e69754f18 100644
--- a/sbin/isakmpd/pf_key_v2.c
+++ b/sbin/isakmpd/pf_key_v2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf_key_v2.c,v 1.85 2001/08/19 18:24:29 angelos Exp $ */
+/* $OpenBSD: pf_key_v2.c,v 1.86 2001/08/23 16:56:46 markus Exp $ */
/* $EOM: pf_key_v2.c,v 1.79 2000/12/12 00:33:19 niklas Exp $ */
/*
@@ -1944,7 +1944,11 @@ pf_key_v2_flow (struct sockaddr *laddr, struct sockaddr *lmask,
if (!ret)
goto cleanup;
err = ((struct sadb_msg *)TAILQ_FIRST (ret)->seg)->sadb_msg_errno;
- if (err)
+ if (!delete && err == EEXIST)
+ {
+ LOG_DBG ((LOG_SYSDEP, 50, "pf_key_v2_flow: SPDADD returns EEXIST"));
+ }
+ else if (err)
{
log_print ("pf_key_v2_flow: SPD%s: %s", delete ? "DELETE" : "ADD",
strerror (err));