rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-10-14 10:27:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update to FreeBSD head 2018-11-15

Browse Source 
Git mirror commit a18b0830c4be01b39489a891b63d6023ada6358a.

Update #3472.
This commit is contained in:
Sebastian Huber
2018-11-06 15:42:44 +01:00
parent d4bf70e497
commit e0b4edbdcc
106 changed files with 5674 additions and 3386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
freebsd/sbin/pfctl/parse.y
View File

@@ -776,8 +776,16 @@ numberstring : NUMBER {
;
varset : STRING '=' varstring {
char *s = $1;
if (pf->opts & PF_OPT_VERBOSE)
printf("%s = \"%s\"\n", $1, $3);
while (*s++) {
if (isspace((unsigned char)*s)) {
yyerror("macro name cannot contain "
"whitespace");
YYERROR;
}
}
if (symset($1, $3, 0) == -1)
err(1, "cannot store variable %s", $1);
free($1);

4
freebsd/sbin/pfctl/pfctl_parser.c
View File

@@ -1380,6 +1380,9 @@ ifa_lookup(const char *ifa_name, int flags)
last_if = p->ifname;
if ((flags & PFI_AFLAG_NOALIAS) && p->af == AF_INET && got4)
continue;
if ((flags & PFI_AFLAG_NOALIAS) && p->af == AF_INET6 &&
IN6_IS_ADDR_LINKLOCAL(&p->addr.v.a.addr.v6))
continue;
if ((flags & PFI_AFLAG_NOALIAS) && p->af == AF_INET6 && got6)
continue;
if (p->af == AF_INET)
@@ -1414,6 +1417,7 @@ ifa_lookup(const char *ifa_name, int flags)
set_ipmask(n, 128);
}
n->ifindex = p->ifindex;
n->ifname = strdup(p->ifname);
n->next = NULL;
n->tail = n;