summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sshd_config.55
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 090e2352c..e6b69c1f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,9 @@
53 and "user@realm"-style naming policies in certificates. 53 and "user@realm"-style naming policies in certificates.
54 54
55 feedback and ok markus@ 55 feedback and ok markus@
56 - jmc@cvs.openbsd.org 2010/05/07 12:49:17
57 [sshd_config.5]
58 tweak previous;
56 59
5720100423 6020100423
58 - (dtucker) [configure.ac] Bug #1756: Check for the existence of a lib64 dir 61 - (dtucker) [configure.ac] Bug #1756: Check for the existence of a lib64 dir
diff --git a/sshd_config.5 b/sshd_config.5
index a5260d358..f9814f9a0 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: sshd_config.5,v 1.121 2010/05/07 11:30:30 djm Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.122 2010/05/07 12:49:17 jmc Exp $
38.Dd $Mdocdate: May 7 2010 $ 38.Dd $Mdocdate: May 7 2010 $
39.Dt SSHD_CONFIG 5 39.Dt SSHD_CONFIG 5
40.Os 40.Os
@@ -189,7 +189,7 @@ After expansion,
189is taken to be an absolute path or one relative to the user's home 189is taken to be an absolute path or one relative to the user's home
190directory. 190directory.
191.Pp 191.Pp
192The default is not to use a principals file - in this case, the username 192The default is not to use a principals file \(en in this case, the username
193of the user must appear in a certificate's principals list for it to be 193of the user must appear in a certificate's principals list for it to be
194accepted. 194accepted.
195Note that 195Note that
@@ -203,7 +203,6 @@ though the
203key option offers a similar facility (see 203key option offers a similar facility (see
204.Xr sshd 8 204.Xr sshd 8
205for details). 205for details).
206.Pp
207.It Cm Banner 206.It Cm Banner
208The contents of the specified file are sent to the remote user before 207The contents of the specified file are sent to the remote user before
209authentication is allowed. 208authentication is allowed.