Module Name: src
Committed By: tteras
Date: Tue Apr 28 13:54:07 UTC 2009
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: handler.c
Log Message:
Reset nat_oa variables too when reusing phase two handler. Otherwise
phase2 rekeying might fail in some scenarios.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/crypto/dist/ipsec-tools/src/racoon/handler.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/handler.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.27 src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.28
--- src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.27 Mon Apr 20 13:16:52 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/handler.c Tue Apr 28 13:54:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: handler.c,v 1.27 2009/04/20 13:16:52 tteras Exp $ */
+/* $NetBSD: handler.c,v 1.28 2009/04/28 13:54:07 tteras Exp $ */
/* Id: handler.c,v 1.28 2006/05/26 12:17:29 manubsd Exp */
@@ -736,6 +736,17 @@
oakley_delivm(iph2->ivm);
iph2->ivm = NULL;
}
+
+#ifdef ENABLE_NATT
+ if (iph2->natoa_src) {
+ racoon_free(iph2->natoa_src);
+ iph2->natoa_src = NULL;
+ }
+ if (iph2->natoa_dst) {
+ racoon_free(iph2->natoa_dst);
+ iph2->natoa_dst = NULL;
+ }
+#endif
}
/*
