[src/trunk]: src/crypto/dist/ipsec-tools Really delete phase 1 on Xauth failure

[manu <manu%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5210489c7c78
branches:  trunk
changeset: 581013:5210489c7c78
user:      manu <manu%NetBSD.org@localhost>
date:      Fri May 20 07:34:47 2005 +0000

description:
Really delete phase 1 on Xauth failure

diffstat:

 crypto/dist/ipsec-tools/ChangeLog                 |  3 +++
 crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c |  4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 59452a634ad7 -r 5210489c7c78 crypto/dist/ipsec-tools/ChangeLog
--- a/crypto/dist/ipsec-tools/ChangeLog Fri May 20 07:26:01 2005 +0000
+++ b/crypto/dist/ipsec-tools/ChangeLog Fri May 20 07:34:47 2005 +0000
@@ -1,5 +1,8 @@
 2005-05-20  Emmanuel Dreyfus  <manu%netbsd.org@localhost>
 
+       From Mike Robinson <sundialservices%users.sourceforge.net@localhost>
+       * src/racoon/isakmp_xauth.c: really delete phase 1 on Xauth failure
+
        * src/libipsec/pfkey.c src/racoon/ipsec_doi.c: Fix NAT-T + IPcomp
 
        From hgates <hgates.lists%gmail.com@localhost>
diff -r 59452a634ad7 -r 5210489c7c78 crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c Fri May 20 07:26:01 2005 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c Fri May 20 07:34:47 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isakmp_xauth.c,v 1.1.1.4 2005/03/16 23:52:55 manu Exp $        */
+/*     $NetBSD: isakmp_xauth.c,v 1.2 2005/05/20 07:34:47 manu Exp $    */
 
 /* Id: isakmp_xauth.c,v 1.17.2.3 2005/03/16 00:13:38 manubsd Exp */
 
@@ -915,7 +915,7 @@
                        EVT_PUSH(iph1->local, iph1->remote, 
                            EVTT_XAUTH_FAILED, NULL);
 
-                       iph1->mode_cfg->flags &= ISAKMP_CFG_DELETE_PH1;
+                       iph1->mode_cfg->flags |= ISAKMP_CFG_DELETE_PH1;
                } else {
                        EVT_PUSH(iph1->local, 
                            iph1->remote, EVTT_XAUTH_SUCCESS, NULL);