svn commit: r353076 - stable/11/contrib/ipfilter/tools

[Cy Schubert]

Author: cy
Date: Fri Oct  4 01:41:29 2019
New Revision: 353076
URL: https://svnweb.freebsd.org/changeset/base/353076

Log:
  MFC r319795:
  
  Disable the -O (output fields) option in poollist() (ippool -l) for
  now. The option does not presently work. However, similar functions in
  ipfstat (for state) and ipnat (for nat) do work and provide outputs that
  can be easily parsed by shell scripts or subsequently loaded into CSV
  files.  The intention here is to return to this option to make it work.
  I suspect the problem is in printpoolfields.c.

Modified:
  stable/11/contrib/ipfilter/tools/ippool.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/contrib/ipfilter/tools/ippool.c
==============================================================================
--- stable/11/contrib/ipfilter/tools/ippool.c	Fri Oct  4 01:40:04 2019	(r353075)
+++ stable/11/contrib/ipfilter/tools/ippool.c	Fri Oct  4 01:41:29 2019	(r353076)
@@ -73,7 +73,7 @@ usage(prog)
 	fprintf(stderr, "\t-A [-dnv] [-m <name>] [-o <role>] [-S <seed>] [-t <type>]\n");
 	fprintf(stderr, "\t-f <file> [-dnuv]\n");
 	fprintf(stderr, "\t-F [-dv] [-o <role>] [-t <type>]\n");
-	fprintf(stderr, "\t-l [-dv] [-m <name>] [-t <type>] [-O <fields>]\n");
+	fprintf(stderr, "\t-l [-dv] [-m <name>] [-t <type>]\n");
 	fprintf(stderr, "\t-r [-dnv] [-m <name>] [-o <role>] [-t type] -i <ipaddr>[/netmask]\n");
 	fprintf(stderr, "\t-R [-dnv] [-m <name>] [-o <role>] [-t <type>]\n");
 	fprintf(stderr, "\t-s [-dtv] [-M <core>] [-N <namelist>]\n");
@@ -681,9 +681,16 @@ poollist(argc, argv)
 				return -1;
 			}
 			break;
+#if 0
 		case 'O' :
+			/* XXX This option does not work. This function as  */
+			/* XXX used by state and nat can be used to format  */
+			/* XXX output especially useful for scripting. It   */
+			/* XXX is left here with the intention of making    */
+			/* XXX it work for the same purpose at some point.  */
 			pool_fields = parsefields(poolfields, optarg);
 			break;
+#endif
 		case 't' :
 			type = gettype(optarg, NULL);
 			if (type == IPLT_NONE) {