Commit 57260c87 authored by HardenedBSD Sync Service's avatar HardenedBSD Sync Service
Browse files

Merge branch 'freebsd/current/main' into hardened/current/master

parents 02434f74 74237127
......@@ -671,7 +671,7 @@ prmount(struct statfs *sfp)
struct passwd *pw;
char *fsidbuf;
xo_emit("{:special}{L: on }{:node}{L: (}{:fstype}", sfp->f_mntfromname,
xo_emit("{:special/%hs}{L: on }{:node/%hs}{L: (}{:fstype}", sfp->f_mntfromname,
sfp->f_mntonname, sfp->f_fstypename);
flags = sfp->f_flags & MNT_VISFLAGMASK;
......@@ -687,9 +687,9 @@ prmount(struct statfs *sfp)
if ((flags & MNT_USER) != 0 || sfp->f_owner != 0) {
xo_emit("{D:, }{L:mounted by }");
if ((pw = getpwuid(sfp->f_owner)) != NULL)
xo_emit("{:mounter}", pw->pw_name);
xo_emit("{:mounter/%hs}", pw->pw_name);
else
xo_emit("{:mounter}", sfp->f_owner);
xo_emit("{:mounter/%hs}", sfp->f_owner);
}
if (verbose) {
if (sfp->f_syncwrites != 0 || sfp->f_asyncwrites != 0) {
......
......@@ -292,6 +292,7 @@ woodsb02 [label="Ben Woods\nwoodsb02@FreeBSD.org\n2016/05/09"]
wxs [label="Wesley Shields\nwxs@FreeBSD.org\n2008/01/03"]
xmj [label="Johannes Jost Meixner\nxmj@FreeBSD.org\n2014/04/07"]
xride [label="Soeren Straarup\nxride@FreeBSD.org\n2006/09/27"]
yasu [label="Yasuhiro Kimura\nyasu@FreeBSD.org\n2021/08/27"]
ygy [label="Guangyuan Yang\nygy@FreeBSD.org\n2021/05/17"]
yuri [label="Yuri Victorovich\nyuri@FreeBSD.org\n2017/10/30"]
yzlin [label="Yi-Jheng Lin\nyzlin@FreeBSD.org\n2009/07/19"]
......@@ -607,6 +608,8 @@ matthew -> leres
matthew -> lifanov
matthew -> ultima
meta -> yasu
mezz -> tmclaugh
miwi -> amdmi3
......@@ -816,4 +819,6 @@ wxs -> skreuzer
wxs -> swills
wxs -> zi
ygy -> yasu
}
......@@ -344,7 +344,7 @@ ipsec4_check_pmtu(struct mbuf *m, struct secpolicy *sp, int forwarding)
if (m_length(m, NULL) + hlen > pmtu) {
/*
* If we're forwarding generate ICMP message here,
* so that it contains pmtu substraced by header size.
* so that it contains pmtu subtracted by header size.
* Set error to EINPROGRESS, in order for the frame
* to be dropped silently.
*/
......@@ -738,7 +738,7 @@ ipsec6_check_pmtu(struct mbuf *m, struct secpolicy *sp, int forwarding)
if (m_length(m, NULL) + hlen > pmtu) {
/*
* If we're forwarding generate ICMPv6 message here,
* so that it contains pmtu substracted by header size.
* so that it contains pmtu subtracted by header size.
* Set error to EINPROGRESS, in order for the frame
* to be dropped silently.
*/
......
......@@ -285,6 +285,7 @@
07/10 David Schultz <das@FreeBSD.org> born in Oakland, California, United States, 1982
07/10 Ben Woods <woodsb02@FreeBSD.org> born in Perth, Western Australia, Australia, 1984
07/11 Jesus R. Camou <jcamou@FreeBSD.org> born in Hermosillo, Sonora, Mexico, 1983
07/12 Yasuhiro Kimura <yasu@FreeBSD.org> born in Okazaki, Aichi, Japan, 1967
07/14 Fernando Apesteguia <fernape@FreeBSD.org> born in Madrid, Spain, 1981
07/15 Gary Jennejohn <gj@FreeBSD.org> born in Rochester, New York, United States, 1950
07/16 Suleiman Souhlal <ssouhlal@FreeBSD.org> born in Roma, Italy, 1983
......
......@@ -1357,31 +1357,25 @@ parsemsg(const char *from, char *msg)
size_t i;
int pri;
i = -1;
pri = DEFUPRI;
/* Parse PRI. */
if (msg[0] != '<' || !isdigit(msg[1])) {
dprintf("Invalid PRI from %s\n", from);
return;
}
for (i = 2; i <= 4; i++) {
if (msg[i] == '>')
break;
if (!isdigit(msg[i])) {
dprintf("Invalid PRI header from %s\n", from);
return;
if (msg[0] == '<' && isdigit(msg[1])) {
for (i = 2; i <= 4; i++) {
if (msg[i] == '>') {
errno = 0;
n = strtol(msg + 1, &q, 10);
if (errno == 0 && *q == msg[i] && n >= 0 && n <= INT_MAX) {
pri = n;
msg += i + 1;
i = 0;
}
break;
}
}
}
if (msg[i] != '>') {
dprintf("Invalid PRI header from %s\n", from);
return;
}
errno = 0;
n = strtol(msg + 1, &q, 10);
if (errno != 0 || *q != msg[i] || n < 0 || n >= INT_MAX) {
dprintf("Invalid PRI %ld from %s: %s\n",
n, from, strerror(errno));
return;
}
pri = n;
if (pri &~ (LOG_FACMASK|LOG_PRIMASK))
pri = DEFUPRI;
......@@ -1394,8 +1388,7 @@ parsemsg(const char *from, char *msg)
pri = LOG_MAKEPRI(LOG_USER, LOG_PRI(pri));
/* Parse VERSION. */
msg += i + 1;
if (msg[0] == '1' && msg[1] == ' ')
if (i == 0 && msg[0] == '1' && msg[1] == ' ')
parsemsg_rfc5424(from, pri, msg + 2);
else
parsemsg_rfc3164(from, pri, msg);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment