MFC 1.20: Use fchmod() to restore the tty modes.

3 files changed, 6 insertions, 3 deletions

diff --git a/UPDATING b/UPDATING
index 29dbcd0bccf0..26098813fa39 100644
--- a/UPDATING
+++ b/UPDATING
@@ -11,7 +11,7 @@ the common items quick how-tos, followed by entries for versions of
 
 This is for the 4.5 release branch.  All entries since 4.5 are an
 itemized list of commits to this branch, numbered from the beginning.
-By this count, we're at 4.5-RELEASE-p10.
+By this count, we're at 4.5-RELEASE-p11.
 
 The security advisories related to various patches contain information
 on how to build/install a minimal set of binaries and start/stop a
@@ -19,6 +19,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:	p11	FreeBSD-SA-02:32.pppd
+	A fix for a race condition in pppd(8) was corrected.
+
 20020730:	p10	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 bbd8c8faffd1..fb79c574562f 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -36,7 +36,7 @@
 
 TYPE="FreeBSD"
 REVISION="4.5"
-BRANCH="RELEASE-p10"
+BRANCH="RELEASE-p11"
 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;