diff options
| author | Colin Percival <cperciva@FreeBSD.org> | 2011-04-20 21:00:24 +0000 |
|---|---|---|
| committer | Colin Percival <cperciva@FreeBSD.org> | 2011-04-20 21:00:24 +0000 |
| commit | c86a3ed6524f8ab6395e55670d5a6e0a86c46b4d (patch) | |
| tree | 0d4f71ca8cb06835ad63ec40fb194ed3f0e1aca5 | |
| parent | cb122a13fc0100962e6408f199a57056593b91f9 (diff) | |
Notes
| -rw-r--r-- | UPDATING | 3 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 | ||||
| -rw-r--r-- | usr.sbin/mountd/mountd.c | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -8,6 +8,9 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before running portupgrade. +20110420: p5 FreeBSD-SA-11:01.mountd + Fix CIDR parsing bug in mountd ACLs. + 20101129: p4 FreeBSD-SA-10:10.openssl Fix OpenSSL multiple vulnerabilities. diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 510cd16153cf..d346b451313b 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="7.3" -BRANCH="RELEASE-p4" +BRANCH="RELEASE-p5" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index fbcb4ec61cd9..d9a983a5ada2 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -2676,7 +2676,7 @@ makemask(struct sockaddr_storage *ssp, int bitlen) for (i = 0; i < len; i++) { bits = (bitlen > CHAR_BIT) ? CHAR_BIT : bitlen; - *p++ = (1 << bits) - 1; + *p++ = (u_char)~0 << (CHAR_BIT - bits); bitlen -= bits; } return 0; |