svn commit: r352785 - head/contrib/ipfilter/tools

[Cy Schubert]

Author: cy
Date: Fri Sep 27 00:29:09 2019
New Revision: 352785
URL: https://svnweb.freebsd.org/changeset/base/352785

Log:
  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
  MFC after:	1 week

Modified:
  head/contrib/ipfilter/tools/ippool.c

Modified: head/contrib/ipfilter/tools/ippool.c
==============================================================================
--- head/contrib/ipfilter/tools/ippool.c	Fri Sep 27 00:29:06 2019	(r352784)
+++ head/contrib/ipfilter/tools/ippool.c	Fri Sep 27 00:29:09 2019	(r352785)
@@ -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,
@@ -272,7 +269,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' :
@@ -292,9 +289,6 @@ poolcommand(remove, argc, argv)
 				return -1;
 			}
 			break;
-		case 'R' :
-			opts |= OPT_NORESOLVE;
-			break;
 		case 'S' :
 			if (remove == 0)
 				iph.iph_seed = atoi(optarg);
@@ -368,7 +362,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' :
@@ -377,9 +371,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;