disable admin port better (KAME session.c 1.13 -> 1.14)
This commit is contained in:
parent
6a9f9caed0
commit
63f9c7ba3a
2 changed files with 55 additions and 1 deletions
|
@ -1,6 +1,7 @@
|
|||
$NetBSD: patch-sum,v 1.6 2000/09/23 21:25:07 itojun Exp $
|
||||
$NetBSD: patch-sum,v 1.7 2000/09/24 17:28:23 itojun Exp $
|
||||
|
||||
MD5 (patch-aa) = d22da496fc39e0bc2c926c6ffbb758e1
|
||||
MD5 (patch-ab) = 1a2944fbce4cee174eade2cc0726c0ef
|
||||
MD5 (patch-ac) = 148e0972689931384d1c55d4f99d3f66
|
||||
MD5 (patch-ad) = b99c6e6d3745d87bf62ac622c4ee6756
|
||||
MD5 (patch-ae) = 32d05038b794e589cba080a7a8e86112
|
||||
|
|
53
security/racoon/patches/patch-ae
Normal file
53
security/racoon/patches/patch-ae
Normal file
|
@ -0,0 +1,53 @@
|
|||
$NetBSD: patch-ae,v 1.3 2000/09/24 17:28:25 itojun Exp $
|
||||
|
||||
Index: session.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/kame/kame/kame/kame/racoon/session.c,v
|
||||
retrieving revision 1.13
|
||||
diff -u -r1.13 session.c
|
||||
--- session.c 2000/09/22 18:35:53 1.13
|
||||
+++ session.c 2000/09/24 17:25:49
|
||||
@@ -112,8 +112,10 @@
|
||||
|
||||
FD_ZERO(&mask0);
|
||||
|
||||
+#ifdef ENABLE_ADMINPORT
|
||||
FD_SET(lcconf->sock_admin, &mask0);
|
||||
nfds = (nfds > lcconf->sock_admin ? nfds : lcconf->sock_admin);
|
||||
+#endif
|
||||
FD_SET(lcconf->sock_pfkey, &mask0);
|
||||
nfds = (nfds > lcconf->sock_pfkey ? nfds : lcconf->sock_pfkey);
|
||||
FD_SET(lcconf->rtsock, &mask0);
|
||||
@@ -157,8 +159,10 @@
|
||||
/*NOTREACHED*/
|
||||
}
|
||||
|
||||
+#ifdef ENABLE_ADMINPORT
|
||||
if (FD_ISSET(lcconf->sock_admin, &rfds))
|
||||
admin_handler();
|
||||
+#endif
|
||||
|
||||
for (p = lcconf->myaddrs; p; p = p->next) {
|
||||
if (!p->addr)
|
||||
@@ -185,9 +189,11 @@
|
||||
FD_ZERO(&mask0);
|
||||
nfds = 0;
|
||||
|
||||
+#ifdef ENABLE_ADMINPORT
|
||||
FD_SET(lcconf->sock_admin, &mask0);
|
||||
nfds = (nfds > lcconf->sock_admin
|
||||
? nfds : lcconf->sock_admin);
|
||||
+#endif
|
||||
FD_SET(lcconf->sock_pfkey, &mask0);
|
||||
nfds = (nfds > lcconf->sock_pfkey
|
||||
? nfds : lcconf->sock_pfkey);
|
||||
@@ -364,7 +370,9 @@
|
||||
{
|
||||
isakmp_close();
|
||||
pfkey_close(lcconf->sock_pfkey);
|
||||
+#ifdef ENABLE_ADMINPORT
|
||||
(void)admin_close();
|
||||
+#endif
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in a new issue