d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The no resolve (OPT_NORESOLVE) does nothing. Additionally, it (-R)

Browse Source 
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
This commit is contained in:
Cy Schubert 2019-09-27 00:29:09 +00:00
parent 80aa6435f0
commit e7257e1499
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/ipfilter/tools/ippool.c
View File

@ -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' :
@ -378,9 +372,6 @@ loadpoolfile(argc, argv, infile)
case 'n' :
opts |= OPT_DONOTHING|OPT_DONTOPEN;
break;
case 'R' :
opts |= OPT_NORESOLVE;
break;
case 'u' :
opts |= OPT_REMOVE;
break;