| 1 |
blueness 12/02/28 22:55:18 |
| 2 |
|
| 3 |
Added: racoon.pam.d ipsec-tools-def-psk.patch |
| 4 |
ipsec-tools-include-vendoridh.patch |
| 5 |
Log: |
| 6 |
Address bugs #210826 and #403509 |
| 7 |
|
| 8 |
(Portage version: 2.1.10.44/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-firewall/ipsec-tools/files/racoon.pam.d |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipsec-tools/files/racoon.pam.d?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipsec-tools/files/racoon.pam.d?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: racoon.pam.d |
| 17 |
=================================================================== |
| 18 |
auth include system-remote-login |
| 19 |
account include system-remote-login |
| 20 |
password include system-remote-login |
| 21 |
session include system-remote-login |
| 22 |
|
| 23 |
|
| 24 |
|
| 25 |
1.1 net-firewall/ipsec-tools/files/ipsec-tools-def-psk.patch |
| 26 |
|
| 27 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipsec-tools/files/ipsec-tools-def-psk.patch?rev=1.1&view=markup |
| 28 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipsec-tools/files/ipsec-tools-def-psk.patch?rev=1.1&content-type=text/plain |
| 29 |
|
| 30 |
Index: ipsec-tools-def-psk.patch |
| 31 |
=================================================================== |
| 32 |
diff -brau ipsec-tools-0.7.3.o/src/racoon/oakley.c ipsec-tools-0.7.3/src/racoon/oakley.c |
| 33 |
--- ipsec-tools-0.7.3.o/src/racoon/oakley.c 2009-08-13 11:18:45.000000000 +0200 |
| 34 |
+++ ipsec-tools-0.7.3/src/racoon/oakley.c 2011-06-06 09:36:11.000000000 +0200 |
| 35 |
@@ -2498,8 +2498,21 @@ |
| 36 |
plog(LLV_ERROR, LOCATION, iph1->remote, |
| 37 |
"couldn't find the pskey for %s.\n", |
| 38 |
saddrwop2str(iph1->remote)); |
| 39 |
+ } |
| 40 |
+ } |
| 41 |
+ if (iph1->authstr == NULL) { |
| 42 |
+ /* |
| 43 |
+ * If we could not locate a psk above try and locate |
| 44 |
+ * the default psk, ie, "*". |
| 45 |
+ */ |
| 46 |
+ iph1->authstr = privsep_getpsk("*", 1); |
| 47 |
+ if (iph1->authstr == NULL) { |
| 48 |
+ plog(LLV_ERROR, LOCATION, iph1->remote, |
| 49 |
+ "couldn't find the the default pskey either.\n"); |
| 50 |
goto end; |
| 51 |
} |
| 52 |
+ plog(LLV_NOTIFY, LOCATION, iph1->remote, |
| 53 |
+ "Using default PSK.\n"); |
| 54 |
} |
| 55 |
plog(LLV_DEBUG, LOCATION, NULL, "the psk found.\n"); |
| 56 |
/* should be secret PSK */ |
| 57 |
|
| 58 |
|
| 59 |
|
| 60 |
1.1 net-firewall/ipsec-tools/files/ipsec-tools-include-vendoridh.patch |
| 61 |
|
| 62 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipsec-tools/files/ipsec-tools-include-vendoridh.patch?rev=1.1&view=markup |
| 63 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/ipsec-tools/files/ipsec-tools-include-vendoridh.patch?rev=1.1&content-type=text/plain |
| 64 |
|
| 65 |
Index: ipsec-tools-include-vendoridh.patch |
| 66 |
=================================================================== |
| 67 |
diff -Naur ipsec-tools-0.8.0.orig//src/racoon/ipsec_doi.c ipsec-tools-0.8.0/src/racoon/ipsec_doi.c |
| 68 |
--- ipsec-tools-0.8.0.orig//src/racoon/ipsec_doi.c 2012-02-28 13:42:24.000000000 -0500 |
| 69 |
+++ ipsec-tools-0.8.0/src/racoon/ipsec_doi.c 2012-02-28 13:41:22.000000000 -0500 |
| 70 |
@@ -87,6 +87,7 @@ |
| 71 |
#ifdef HAVE_GSSAPI |
| 72 |
#include <iconv.h> |
| 73 |
#include "gssapi.h" |
| 74 |
+#include "vendorid.h" |
| 75 |
#ifdef HAVE_ICONV_2ND_CONST |
| 76 |
#define __iconv_const const |
| 77 |
#else |
Archives