aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacques Vidrine <nectar@FreeBSD.org>2002-07-30 19:17:27 +0000
committerJacques Vidrine <nectar@FreeBSD.org>2002-07-30 19:17:27 +0000
commit42051819a3fa7cb540a254cc3d982d0dc4b6da0b (patch)
tree85b0608437c25f0a5c8a8a675e86eafd79494413
parent45ce708fb9758901980e06618b2eaeb8005ae348 (diff)
downloadsrc-42051819a3fa7cb540a254cc3d982d0dc4b6da0b.tar.gz
src-42051819a3fa7cb540a254cc3d982d0dc4b6da0b.zip
MFC 1.20: Use fchmod() to restore the tty modes.
Notes
Notes: svn path=/releng/4.4/; revision=100965
-rw-r--r--UPDATING5
-rw-r--r--sys/conf/newvers.sh2
-rw-r--r--usr.sbin/pppd/main.c2
3 files changed, 6 insertions, 3 deletions
diff --git a/UPDATING b/UPDATING
index 10792b7562bf..e37e5e44a437 100644
--- a/UPDATING
+++ b/UPDATING
@@ -10,7 +10,7 @@ Release.
This is for the 4.4 release branch. All entries since 4.4 are an
itemized list of commits to this branch, numbered from the beginning.
-By this count, we're at 4.4-RELEASE-p17.
+By this count, we're at 4.4-RELEASE-p18.
The security advisories related to various patches contain information
on how to build/install a minimal set of binaries and start/stop a
@@ -18,6 +18,9 @@ minimal number of processes, if possible, for that patch. For those
updates that don't have an advisory, or to be safe, you can do a full
build and install as described in the COMMON ITEMS section.
+20020730: p18 FreeBSD-SA-02:32.pppd
+ A fix for a race condition in pppd(8) was corrected.
+
20020730: p17 FreeBSD-SA-02:23.stdio.v1.2
A bug in the previous patch for the vulnerability described
in FreeBSD-SA-02:23.stdio was found and corrected.
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index c0ee546323a5..34bcdc41987d 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -36,7 +36,7 @@
TYPE="FreeBSD"
REVISION="4.4"
-BRANCH="RELEASE-p17"
+BRANCH="RELEASE-p18"
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"
diff --git a/usr.sbin/pppd/main.c b/usr.sbin/pppd/main.c
index ba9c25488bf0..980064b0444c 100644
--- a/usr.sbin/pppd/main.c
+++ b/usr.sbin/pppd/main.c
@@ -833,7 +833,7 @@ close_tty()
restore_tty(ttyfd);
if (tty_mode != (mode_t) -1)
- chmod(devnam, tty_mode);
+ fchmod(ttyfd, tty_mode);
close(ttyfd);
ttyfd = -1;