summaryrefslogtreecommitdiff
path: root/sbin/isakmpd/sa.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2005-04-08 16:37:16 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2005-04-08 16:37:16 +0000
commitf49279cdf071a5ab367e1553a8119d25cc269cee (patch)
tree09b035c863c017f909d34e4e70297f28b05c5534 /sbin/isakmpd/sa.c
parent415403bc073db310bf8ad65abed26f6253c78c3c (diff)
nat-traversal always
Diffstat (limited to 'sbin/isakmpd/sa.c')
-rw-r--r--sbin/isakmpd/sa.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sbin/isakmpd/sa.c b/sbin/isakmpd/sa.c
index 7a49fa9b098..a7562298677 100644
--- a/sbin/isakmpd/sa.c
+++ b/sbin/isakmpd/sa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sa.c,v 1.93 2005/04/06 16:00:20 deraadt Exp $ */
+/* $OpenBSD: sa.c,v 1.94 2005/04/08 16:37:15 deraadt Exp $ */
/* $EOM: sa.c,v 1.112 2000/12/12 00:22:52 niklas Exp $ */
/*
@@ -799,10 +799,8 @@ sa_release(struct sa *sa)
free(sa->name);
if (sa->keystate)
free(sa->keystate);
-#if defined (USE_NAT_TRAVERSAL)
if (sa->nat_t_keepalive)
timer_remove_event(sa->nat_t_keepalive);
-#endif
#if defined (USE_DPD)
if (sa->dpd_event)
timer_remove_event(sa->dpd_event);