Author: cy
Date: Tue Feb 25 21:02:52 2020
New Revision: 358321
URL: https://svnweb.freebsd.org/changeset/base/358321
Log:
MFC r358064:
As with ipf(8), give ippool(8) the ability to load IP pools from multiple
files. This allows for loading, during the same invocation of ippool, of
multiple sources of input using multiple tools to concurrently maintain the
files such as fail2ban, macro preprocessors, and manually.
Modified:
stable/11/contrib/ipfilter/man/ippool.8
stable/11/contrib/ipfilter/tools/ippool.c
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/12/contrib/ipfilter/man/ippool.8
stable/12/contrib/ipfilter/tools/ippool.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/11/contrib/ipfilter/man/ippool.8
==============================================================================
--- stable/11/contrib/ipfilter/man/ippool.8 Tue Feb 25 19:29:05 2020
(r358320)
+++ stable/11/contrib/ipfilter/man/ippool.8 Tue Feb 25 21:02:52 2020
(r358321)
@@ -12,7 +12,7 @@ ippool \- user interface to the IPFilter pools
-A [-dnv] [-m <name>] [-o <role>] [-S <seed>] -t <type>
.br
.B ippool
--f <file> [-dnuv]
+-f <file> [-dnuv] [-f <file [-dnuv]] ...
.br
.B ippool
-F [-dv] [-o <role>] [-t <type>]
Modified: stable/11/contrib/ipfilter/tools/ippool.c
==============================================================================
--- stable/11/contrib/ipfilter/tools/ippool.c Tue Feb 25 19:29:05 2020
(r358320)
+++ stable/11/contrib/ipfilter/tools/ippool.c Tue Feb 25 21:02:52 2020
(r358321)
@@ -377,12 +377,16 @@ loadpoolfile(argc, argv, infile)
{
int c;
- while ((c = getopt(argc, argv, "dnuv")) != -1)
+ while ((c = getopt(argc, argv, "dnuvf:")) != -1)
switch (c)
{
case 'd' :
opts |= OPT_DEBUG;
ippool_yydebug++;
+ break;
+ case 'f' :
+ if (loadpoolfile(argc, argv, optarg) != 0)
+ return(-1);
break;
case 'n' :
opts |= OPT_DONOTHING|OPT_DONTOPEN;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
