RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- stevesk@cvs.openbsd.org 2005/12/17 21:13:05 

[ssh_config.5 session.c]
     spelling: fowarding, fowarded
This commit is contained in:
Darren Tucker 2005-12-20 16:14:15 +11:00
parent 5652924ad9
commit 635518705a
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -16,6 +16,9 @@
- jmc@cvs.openbsd.org 2005/12/16 18:14:40
[ssh.1]
signpost the protocol sections;
- stevesk@cvs.openbsd.org 2005/12/17 21:13:05
[ssh_config.5 session.c]
spelling: fowarding, fowarded
20051219
- (dtucker) [cipher-aes.c cipher-ctr.c cipher.c configure.ac
@ -3490,4 +3493,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4036 2005/12/20 05:12:24 dtucker Exp $
$Id: ChangeLog,v 1.4037 2005/12/20 05:14:15 dtucker Exp $

4
session.c
View File

@ -33,7 +33,7 @@
*/
#include "includes.h"
RCSID("$OpenBSD: session.c,v 1.189 2005/12/12 13:46:18 markus Exp $");
RCSID("$OpenBSD: session.c,v 1.190 2005/12/17 21:13:05 stevesk Exp $");
#include "ssh.h"
#include "ssh1.h"
@ -1869,7 +1869,7 @@ session_x11_req(Session *s)
if (s->auth_proto != NULL || s->auth_data != NULL) {
error("session_x11_req: session %d: "
"x11 fowarding already active", s->self);
"x11 forwarding already active", s->self);
return 0;
}
s->single_connection = packet_get_char();

4
ssh_config.5
View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $OpenBSD: ssh_config.5,v 1.69 2005/12/08 21:37:50 jmc Exp $
.\" $OpenBSD: ssh_config.5,v 1.70 2005/12/17 21:13:05 stevesk Exp $
.Dd September 25, 1999
.Dt SSH_CONFIG 5
.Os
@ -285,7 +285,7 @@ will continue without connecting to a master instance.
X11 and
.Xr ssh-agent 1
forwarding is supported over these multiplexed connections, however the
display and agent fowarded will be the one belonging to the master
display and agent forwarded will be the one belonging to the master
connection i.e. it is not possible to forward multiple displays or agents.
.Pp
Two additional options allow for opportunistic multiplexing: try to use a