summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh.16
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c712b1282..face2654f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@
17 - markus@cvs.openbsd.org 2001/07/20 14:46:11 17 - markus@cvs.openbsd.org 2001/07/20 14:46:11
18 [ssh-agent.c] 18 [ssh-agent.c]
19 do not exit() from signal handlers; ok deraadt@ 19 do not exit() from signal handlers; ok deraadt@
20 - stevesk@cvs.openbsd.org 2001/07/20 18:41:51
21 [ssh.1]
22 "the" command line
20 23
2120010719 2420010719
22 - (tim) [configure.in] put inet_aton back in AC_CHECK_FUNCS. 25 - (tim) [configure.in] put inet_aton back in AC_CHECK_FUNCS.
@@ -6090,4 +6093,4 @@
6090 - Wrote replacements for strlcpy and mkdtemp 6093 - Wrote replacements for strlcpy and mkdtemp
6091 - Released 1.0pre1 6094 - Released 1.0pre1
6092 6095
6093$Id: ChangeLog,v 1.1420 2001/07/22 20:44:00 mouring Exp $ 6096$Id: ChangeLog,v 1.1421 2001/07/22 20:45:39 mouring Exp $
diff --git a/ssh.1 b/ssh.1
index 0cc56ae8c..061f5d15d 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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: ssh.1,v 1.119 2001/07/19 00:41:44 stevesk Exp $ 37.\" $OpenBSD: ssh.1,v 1.120 2001/07/20 18:41:51 stevesk Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -349,10 +349,10 @@ sent to the server machine (and no cookies are sent in the plain).
349.Pp 349.Pp
350If the user is using an authentication agent, the connection to the agent 350If the user is using an authentication agent, the connection to the agent
351is automatically forwarded to the remote side unless disabled on 351is automatically forwarded to the remote side unless disabled on
352command line or in a configuration file. 352the command line or in a configuration file.
353.Pp 353.Pp
354Forwarding of arbitrary TCP/IP connections over the secure channel can 354Forwarding of arbitrary TCP/IP connections over the secure channel can
355be specified either on command line or in a configuration file. 355be specified either on the command line or in a configuration file.
356One possible application of TCP/IP forwarding is a secure connection to an 356One possible application of TCP/IP forwarding is a secure connection to an
357electronic purse; another is going through firewalls. 357electronic purse; another is going through firewalls.
358.Pp 358.Pp