summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--session.c4
-rw-r--r--ssh_config.54
3 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index be12b11ab..26b7251bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@
16 - jmc@cvs.openbsd.org 2005/12/16 18:14:40 16 - jmc@cvs.openbsd.org 2005/12/16 18:14:40
17 [ssh.1] 17 [ssh.1]
18 signpost the protocol sections; 18 signpost the protocol sections;
19 - stevesk@cvs.openbsd.org 2005/12/17 21:13:05
20 [ssh_config.5 session.c]
21 spelling: fowarding, fowarded
19 22
2020051219 2320051219
21 - (dtucker) [cipher-aes.c cipher-ctr.c cipher.c configure.ac 24 - (dtucker) [cipher-aes.c cipher-ctr.c cipher.c configure.ac
@@ -3490,4 +3493,4 @@
3490 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3493 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3491 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3494 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3492 3495
3493$Id: ChangeLog,v 1.4036 2005/12/20 05:12:24 dtucker Exp $ 3496$Id: ChangeLog,v 1.4037 2005/12/20 05:14:15 dtucker Exp $
diff --git a/session.c b/session.c
index 8d186dd7d..8826fabaa 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
33 */ 33 */
34 34
35#include "includes.h" 35#include "includes.h"
36RCSID("$OpenBSD: session.c,v 1.189 2005/12/12 13:46:18 markus Exp $"); 36RCSID("$OpenBSD: session.c,v 1.190 2005/12/17 21:13:05 stevesk Exp $");
37 37
38#include "ssh.h" 38#include "ssh.h"
39#include "ssh1.h" 39#include "ssh1.h"
@@ -1869,7 +1869,7 @@ session_x11_req(Session *s)
1869 1869
1870 if (s->auth_proto != NULL || s->auth_data != NULL) { 1870 if (s->auth_proto != NULL || s->auth_data != NULL) {
1871 error("session_x11_req: session %d: " 1871 error("session_x11_req: session %d: "
1872 "x11 fowarding already active", s->self); 1872 "x11 forwarding already active", s->self);
1873 return 0; 1873 return 0;
1874 } 1874 }
1875 s->single_connection = packet_get_char(); 1875 s->single_connection = packet_get_char();
diff --git a/ssh_config.5 b/ssh_config.5
index 50df0d432..56fc65ed0 100644
--- a/ssh_config.5
+++ b/ssh_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: ssh_config.5,v 1.69 2005/12/08 21:37:50 jmc Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.70 2005/12/17 21:13:05 stevesk Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
@@ -285,7 +285,7 @@ will continue without connecting to a master instance.
285X11 and 285X11 and
286.Xr ssh-agent 1 286.Xr ssh-agent 1
287forwarding is supported over these multiplexed connections, however the 287forwarding is supported over these multiplexed connections, however the
288display and agent fowarded will be the one belonging to the master 288display and agent forwarded will be the one belonging to the master
289connection i.e. it is not possible to forward multiple displays or agents. 289connection i.e. it is not possible to forward multiple displays or agents.
290.Pp 290.Pp
291Two additional options allow for opportunistic multiplexing: try to use a 291Two additional options allow for opportunistic multiplexing: try to use a