summaryrefslogtreecommitdiff
path: root/security/isakmpd/files/patch-ike_quick_mode.c
diff options
context:
space:
mode:
authorSimon L. B. Nielsen <simon@FreeBSD.org>2004-12-14 11:49:45 +0000
committerSimon L. B. Nielsen <simon@FreeBSD.org>2004-12-14 11:49:45 +0000
commitebd97bd79dd24f0dc93f8d6d4cf9e641d3978895 (patch)
tree12539819cf04286523e6110adeb712a0e3895563 /security/isakmpd/files/patch-ike_quick_mode.c
parentRoll back my previous commit. (diff)
- Update to a new snapshot from the OpenBSD 2.6 branch dated 20041207
which, among many other things, fixes the know security vulnerabilities. - Remove some notes about tracking NetBSD, since the port does not do that anymore. - Remove out-of-date information from pkg-descr. - Take maintainership. Approved by: nectar
Notes
Notes: svn path=/head/; revision=123999
Diffstat (limited to 'security/isakmpd/files/patch-ike_quick_mode.c')
-rw-r--r--security/isakmpd/files/patch-ike_quick_mode.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/security/isakmpd/files/patch-ike_quick_mode.c b/security/isakmpd/files/patch-ike_quick_mode.c
new file mode 100644
index 000000000000..e57047df5f01
--- /dev/null
+++ b/security/isakmpd/files/patch-ike_quick_mode.c
@@ -0,0 +1,16 @@
+--- ike_quick_mode.c 2004/08/14 13:29:50 1.86
++++ ike_quick_mode.c 2004/09/17 13:53:08 1.87
+@@ -1739,8 +1739,11 @@
+ "strdup (\"%s\") failed", name);
+ goto cleanup;
+ }
+- } else if (ignore_policy || strncmp("yes", conf_get_str("General",
+- "Use-Keynote"), 3)) {
++ } else if (
++#ifdef USE_POLICY
++ ignore_policy ||
++#endif
++ strncmp("yes", conf_get_str("General", "Use-Keynote"), 3)) {
+ log_print("responder_recv_HASH_SA_NONCE: peer proposed "
+ "invalid phase 2 IDs: %s",
+ (exchange->doi->decode_ids("initiator id %s, responder"