diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-12-12 01:47:13 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-12-12 01:47:13 +0000 |
| commit | 4619cf54af73e542b3cf5ec2108b4d13f2f06a1a (patch) | |
| tree | f4d5dd6ed33c18fcd63c8e72433eea6871c24d48 | |
| parent | 907ca04a6cf50cd422bc50ef945ddabb4b19901c (diff) | |
Merge with EOM 1.112
author: niklas
style
author: angelos
Don't limit Phase 1 SA establishment -- while this does limit resource
consumption, it's neither foolproof nor entirely correct (it
introduces some synchronization problems).
| -rw-r--r-- | sbin/isakmpd/sa.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sbin/isakmpd/sa.c b/sbin/isakmpd/sa.c index 94bedf804fd..1313fd6ef09 100644 --- a/sbin/isakmpd/sa.c +++ b/sbin/isakmpd/sa.c @@ -1,5 +1,5 @@ -/* $OpenBSD: sa.c,v 1.32 2000/10/16 23:27:43 niklas Exp $ */ -/* $EOM: sa.c,v 1.110 2000/10/16 18:16:59 provos Exp $ */ +/* $OpenBSD: sa.c,v 1.33 2000/12/12 01:47:12 niklas Exp $ */ +/* $EOM: sa.c,v 1.112 2000/12/12 00:22:52 niklas Exp $ */ /* * Copyright (c) 1998, 1999, 2000 Niklas Hallqvist. All rights reserved. @@ -625,7 +625,9 @@ sa_add_transform (struct sa *sa, struct payload *xf, int initiator, void sa_delete (struct sa *sa, int notify) { - message_send_delete (sa); + /* Don't bother notifying of Phase 1 SA deletes. */ + if (sa->phase != 1) + message_send_delete (sa); sa_free (sa); } |