From 83026a7004e5436cac02261038651142f8127e8d Mon Sep 17 00:00:00 2001
From: "Bruce A. Mah" <bmah@FreeBSD.org>
Date: Mon, 6 Oct 2003 04:13:23 +0000
Subject: [PATCH] New release note:  SA-03:15.

MFC noted:  mount_msdosfs(8) -M.
---
 release/doc/en_US.ISO8859-1/relnotes/article.sgml    | 8 +++++++-
 release/doc/en_US.ISO8859-1/relnotes/common/new.sgml | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index 9dad2efa717f..56bcfa388551 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -152,6 +152,12 @@
       <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:14.arp.asc">FreeBSD-SA-03:14</ulink>.
       &merged;</para>
 
+    <para>Several errors in the <application>OpenSSH</application> PAM
+      challenge/authentication subsystem have been fixed.  The impacts
+      of these bugs vary; details can be found in security advisory
+      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:15.openssh.asc">FreeBSD-SA-03:15</ulink>.
+      &merged;</para>
+
     <para>A bug in &man.procfs.5; and &man.linprocfs.5;, which could result in
       disclosing the contents of kernel memory, has been fixed.
       More information can be found in security advisory
@@ -477,7 +483,7 @@
 
     <para>The &man.mount.msdosfs.8; utility now supports a
       <option>-M</option> option to specify the maximum file
-      permissions for directories in the file system.</para>
+      permissions for directories in the file system. &merged;</para>
 
     <para>The &man.mount.msdosfs.8; utility now supports a
       <option>-D</option> option to specify MS-DOS codepages and a
diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
index 9dad2efa717f..56bcfa388551 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -152,6 +152,12 @@
       <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:14.arp.asc">FreeBSD-SA-03:14</ulink>.
       &merged;</para>
 
+    <para>Several errors in the <application>OpenSSH</application> PAM
+      challenge/authentication subsystem have been fixed.  The impacts
+      of these bugs vary; details can be found in security advisory
+      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:15.openssh.asc">FreeBSD-SA-03:15</ulink>.
+      &merged;</para>
+
     <para>A bug in &man.procfs.5; and &man.linprocfs.5;, which could result in
       disclosing the contents of kernel memory, has been fixed.
       More information can be found in security advisory
@@ -477,7 +483,7 @@
 
     <para>The &man.mount.msdosfs.8; utility now supports a
       <option>-M</option> option to specify the maximum file
-      permissions for directories in the file system.</para>
+      permissions for directories in the file system. &merged;</para>
 
     <para>The &man.mount.msdosfs.8; utility now supports a
       <option>-D</option> option to specify MS-DOS codepages and a