svn commit: r353093 - in stable: 11/contrib/ipfilter/tools 12/contrib/ipfilter/tools

[Cy Schubert]

Author: cy
Date: Fri Oct  4 02:09:51 2019
New Revision: 353093
URL: https://svnweb.freebsd.org/changeset/base/353093

Log:
  MFC r352785:
  
  The no resolve (OPT_NORESOLVE) does nothing. Additionally, it (-R)
  conflicts with the command option of the same name (also -R).
  Remove the superfluous and confusing non-global non-command -R option.
  
  PR:		218433

Modified:
  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/tools/ippool.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/contrib/ipfilter/tools/ippool.c
==============================================================================
--- stable/11/contrib/ipfilter/tools/ippool.c	Fri Oct  4 02:06:23 2019	(r353092)
+++ stable/11/contrib/ipfilter/tools/ippool.c	Fri Oct  4 02:09:51 2019	(r353093)
@@ -145,7 +145,7 @@ poolnodecommand(remove, argc, argv)
 	bzero((char *)&pnode, sizeof(pnode));
 	bzero((char *)&hnode, sizeof(hnode));
 
-	while ((c = getopt(argc, argv, "di:m:no:Rt:T:v")) != -1)
+	while ((c = getopt(argc, argv, "di:m:no:t:T:v")) != -1)
 		switch (c)
 		{
 		case 'd' :
@@ -172,9 +172,6 @@ poolnodecommand(remove, argc, argv)
 			if (role == IPL_LOGNONE)
 				return -1;
 			break;
-		case 'R' :
-			opts |= OPT_NORESOLVE;
-			break;
 		case 't' :
 			if (ipset == 1) {
 				fprintf(stderr,
@@ -268,7 +265,7 @@ poolcommand(remove, argc, argv)
 	bzero((char *)&iph, sizeof(iph));
 	bzero((char *)&pool, sizeof(pool));
 
-	while ((c = getopt(argc, argv, "dm:no:RS:v")) != -1)
+	while ((c = getopt(argc, argv, "dm:no:S:v")) != -1)
 		switch (c)
 		{
 		case 'd' :
@@ -288,9 +285,6 @@ poolcommand(remove, argc, argv)
 				return -1;
 			}
 			break;
-		case 'R' :
-			opts |= OPT_NORESOLVE;
-			break;
 		case 'S' :
 			if (remove == 0)
 				iph.iph_seed = atoi(optarg);
@@ -364,7 +358,7 @@ loadpoolfile(argc, argv, infile)
 {
 	int c;
 
-	while ((c = getopt(argc, argv, "dnRuv")) != -1)
+	while ((c = getopt(argc, argv, "dnuv")) != -1)
 		switch (c)
 		{
 		case 'd' :
@@ -373,9 +367,6 @@ loadpoolfile(argc, argv, infile)
 			break;
 		case 'n' :
 			opts |= OPT_DONOTHING|OPT_DONTOPEN;
-			break;
-		case 'R' :
-			opts |= OPT_NORESOLVE;
 			break;
 		case 'u' :
 			opts |= OPT_REMOVE;