summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-06-12 00:23:12 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-06-12 00:23:12 +0000
commit34a996877eed6e97c73e5af5f5fb3de1919c044c (patch)
tree8a8216d9fe58f02f1df33d1a474f255dd3611673
parent88259fbbc59253224aa5d0124eeab0b34140d985 (diff)
- markus@cvs.openbsd.org 2001/06/11 16:04:38
[sshd.8] typo; bdubreuil@crrel.usace.army.mil
-rw-r--r--ChangeLog5
-rw-r--r--sshd.86
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ddcce027..8de93d193 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
8 - markus@cvs.openbsd.org 2001/06/11 10:18:24 8 - markus@cvs.openbsd.org 2001/06/11 10:18:24
9 [session.c] 9 [session.c]
10 reset pointer to NULL after xfree(); report from solar@openwall.com 10 reset pointer to NULL after xfree(); report from solar@openwall.com
11 - markus@cvs.openbsd.org 2001/06/11 16:04:38
12 [sshd.8]
13 typo; bdubreuil@crrel.usace.army.mil
11 14
1220010611 1520010611
13 - (bal) NeXT/MacOS X lack libgen.h and dirname(). Patch by Mark Miller 16 - (bal) NeXT/MacOS X lack libgen.h and dirname(). Patch by Mark Miller
@@ -5613,4 +5616,4 @@
5613 - Wrote replacements for strlcpy and mkdtemp 5616 - Wrote replacements for strlcpy and mkdtemp
5614 - Released 1.0pre1 5617 - Released 1.0pre1
5615 5618
5616$Id: ChangeLog,v 1.1279 2001/06/12 00:21:34 mouring Exp $ 5619$Id: ChangeLog,v 1.1280 2001/06/12 00:23:12 mouring Exp $
diff --git a/sshd.8 b/sshd.8
index a66dac54e..7ff4a4201 100644
--- a/sshd.8
+++ b/sshd.8
@@ -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.8,v 1.125 2001/05/20 17:20:35 markus Exp $ 37.\" $OpenBSD: sshd.8,v 1.126 2001/06/11 16:04:38 markus Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -341,7 +341,7 @@ set-up. The following tokens are defined; %% is replaces by a literal '%',
341%u is replaced by the username of that user. 341%u is replaced by the username of that user.
342After expansion, 342After expansion,
343.Cm AuthorizedKeysFile 343.Cm AuthorizedKeysFile
344is taken to be an absolute path or one realtive to the user's home 344is taken to be an absolute path or one relative to the user's home
345directory. 345directory.
346The default is 346The default is
347.Dq .ssh/authorized_keys 347.Dq .ssh/authorized_keys
@@ -355,7 +355,7 @@ set-up. The following tokens are defined; %% is replaces by a literal '%',
355%u is replaced by the username of that user. 355%u is replaced by the username of that user.
356After expansion, 356After expansion,
357.Cm AuthorizedKeysFile2 357.Cm AuthorizedKeysFile2
358is taken to be an absolute path or one realtive to the user's home 358is taken to be an absolute path or one relative to the user's home
359directory. 359directory.
360The default is 360The default is
361.Dq .ssh/authorized_keys2 361.Dq .ssh/authorized_keys2