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

Pre-separate IP addresses passed on the command line, so they can be

Browse Source 
properly parsed for interface prefixes and netmask suffixes.  This was
already done for the old-style (fixed) command line, but missed for
the new-style.

MFC after:	1 week
This commit is contained in:
Jamie Gritton 2012-08-23 01:43:22 +00:00
parent 2b4f1090de
commit b01d717742
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
usr.sbin/jail/jail.c
View File

@ -304,9 +304,33 @@ main(int argc, char **argv)
for (i++; i < argc; i++)
add_param(NULL, NULL, IP_COMMAND,
argv[i]);
break;
}
add_param(NULL, NULL, 0, argv[i]);
#ifdef INET
else if (!strncmp(argv[i], "ip4.addr=", 9)) {
for (cs = argv[i] + 9;; cs = ncs + 1) {
ncs = strchr(cs, ',');
if (ncs)
*ncs = '\0';
add_param(NULL, NULL, KP_IP4_ADDR, cs);
if (!ncs)
break;
}
}
#endif
#ifdef INET6
else if (!strncmp(argv[i], "ip6.addr=", 9)) {
for (cs = argv[i] + 9;; cs = ncs + 1) {
ncs = strchr(cs, ',');
if (ncs)
*ncs = '\0';
add_param(NULL, NULL, KP_IP6_ADDR, cs);
if (!ncs)
break;
}
}
#endif
else
add_param(NULL, NULL, 0, argv[i]);
}
} else {
/* From the config file, perhaps with a specified jail */