summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh-agent.14
-rw-r--r--sshd.84
-rw-r--r--sshd_config.54
4 files changed, 10 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f14f3325..21dca7684 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,9 @@
21 - stevesk@cvs.openbsd.org 2002/06/22 16:41:57 21 - stevesk@cvs.openbsd.org 2002/06/22 16:41:57
22 [scp.1] 22 [scp.1]
23 typo 23 typo
24 - stevesk@cvs.openbsd.org 2002/06/22 16:45:29
25 [ssh-agent.1 sshd.8 sshd_config.5]
26 use process ID vs. pid/PID/process identifier
24 27
2520020622 2820020622
26 - (djm) Update README.privsep; spotted by fries@ 29 - (djm) Update README.privsep; spotted by fries@
@@ -1030,4 +1033,4 @@
1030 - (stevesk) entropy.c: typo in debug message 1033 - (stevesk) entropy.c: typo in debug message
1031 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1034 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1032 1035
1033$Id: ChangeLog,v 1.2250 2002/06/23 00:34:37 mouring Exp $ 1036$Id: ChangeLog,v 1.2251 2002/06/23 00:35:25 mouring Exp $
diff --git a/ssh-agent.1 b/ssh-agent.1
index e5ea1e325..e1a30cb1f 100644
--- a/ssh-agent.1
+++ b/ssh-agent.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-agent.1,v 1.33 2002/06/19 00:27:55 deraadt Exp $ 1.\" $OpenBSD: ssh-agent.1,v 1.34 2002/06/22 16:45:29 stevesk Exp $
2.\" 2.\"
3.\" Author: Tatu Ylonen <ylo@cs.hut.fi> 3.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -151,7 +151,7 @@ user.
151.Pp 151.Pp
152The 152The
153.Ev SSH_AGENT_PID 153.Ev SSH_AGENT_PID
154environment variable holds the agent's PID. 154environment variable holds the agent's process ID.
155.Pp 155.Pp
156The agent exits automatically when the command given on the command 156The agent exits automatically when the command given on the command
157line terminates. 157line terminates.
diff --git a/sshd.8 b/sshd.8
index 37adfae04..37a7b58f6 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.185 2002/06/22 16:32:54 stevesk Exp $ 37.\" $OpenBSD: sshd.8,v 1.186 2002/06/22 16:45:29 stevesk Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -589,7 +589,7 @@ and not group or world-writable.
589Contains the process ID of the 589Contains the process ID of the
590.Nm 590.Nm
591listening for connections (if there are several daemons running 591listening for connections (if there are several daemons running
592concurrently for different ports, this contains the pid of the one 592concurrently for different ports, this contains the process ID of the one
593started last). 593started last).
594The content of this file is not sensitive; it can be world-readable. 594The content of this file is not sensitive; it can be world-readable.
595.It Pa $HOME/.ssh/authorized_keys 595.It Pa $HOME/.ssh/authorized_keys
diff --git a/sshd_config.5 b/sshd_config.5
index 1aecd485b..3e198dfa3 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.3 2002/06/20 23:37:12 markus Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.4 2002/06/22 16:45:29 stevesk Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD_CONFIG 5 39.Dt SSHD_CONFIG 5
40.Os 40.Os
@@ -464,7 +464,7 @@ If this option is set to
464.Dq no 464.Dq no
465root is not allowed to login. 465root is not allowed to login.
466.It Cm PidFile 466.It Cm PidFile
467Specifies the file that contains the process identifier of the 467Specifies the file that contains the process ID of the
468.Nm sshd 468.Nm sshd
469daemon. 469daemon.
470The default is 470The default is