diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2011-01-12 14:23:54 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2011-01-12 14:23:54 +0000 |
| commit | 081eb8f82ae056045ff306c1e4b9965f1fa9c2cd (patch) | |
| tree | d60ac795c4d9011491acaa0345faa8cb28b19a4e /sbin/iked/ikev2.c | |
| parent | a2ee299c29b25108f5da6569a41c0a22b9b590b0 (diff) | |
fixup bogus check; ok reyk
Diffstat (limited to 'sbin/iked/ikev2.c')
| -rw-r--r-- | sbin/iked/ikev2.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sbin/iked/ikev2.c b/sbin/iked/ikev2.c index 3a4b931b934..bbcc6c13d0a 100644 --- a/sbin/iked/ikev2.c +++ b/sbin/iked/ikev2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ikev2.c,v 1.30 2011/01/12 14:22:25 mikeb Exp $ */ +/* $OpenBSD: ikev2.c,v 1.31 2011/01/12 14:23:53 mikeb Exp $ */ /* $vantronix: ikev2.c,v 1.101 2010/06/03 07:57:33 reyk Exp $ */ /* @@ -3648,8 +3648,7 @@ ikev2_childsa_delete(struct iked *env, struct iked_sa *sa, u_int8_t saproto, peerspi = csa->csa_peerspi; key.csa_spi = csa->csa_spi; - if (csa->csa_loaded || - RB_FIND(iked_ipsecsas, &env->sc_ipsecsas, &key)) + if (RB_FIND(iked_ipsecsas, &env->sc_ipsecsas, &key)) RB_REMOVE(iked_ipsecsas, &env->sc_ipsecsas, csa); TAILQ_REMOVE(&sa->sa_childsas, csa, csa_entry); childsa_free(csa); |