Fix kernel panic when IPSec also in use. Also fix patch permissions problem.

PR:		ports/35631
Submitted by:	David Hedley <david@inty.net>
This commit is contained in:
Archie Cobbs 2003-11-10 22:31:28 +00:00
parent f49d5ccc38
commit 7d56a40196
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=93706
2 changed files with 10 additions and 1 deletions

View file

@ -245,6 +245,15 @@ diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/freebsd/skip_es.c work.
skip_param_t params;
skip_hdr_t skip_hdr;
skip_es_hash_t *entry, **acl;
@@ -1408,7 +1436,7 @@
panic("skip_ifinput: mtod returned NULL!");
}
- if (!SKIP_IF(ifp)) {
+ if (!ifp || !SKIP_IF(ifp)) {
/*
* SKIP not present on this interface, pass the packet
*/
@@ -1718,7 +1747,7 @@
*/
decryptbuf->m_data += iphlen;

View file

@ -4,7 +4,7 @@
# Set user-writable flags so patch(1) doesn't trip up.
#
FIXDIRS="${WRKSRC}/skip/man ${WRKSRC}/admin"
FIXDIRS="${WRKSRC}/skip/man ${WRKSRC}/admin ${WRKSRC}/certs/lib ${WRKSRC}/skip/bdcmod/des_ecb"
for DIR in ${FIXDIRS}; do
chmod -R u+w ${DIR}