diff options
author | Damien Miller <djm@mindrot.org> | 2005-12-31 16:19:53 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-12-31 16:19:53 +1100 |
commit | 5eb137c6d11be7db14dc03ea12a74884bebea3e3 (patch) | |
tree | f467cd1a617e9357b44783bffdf838b8ef2eb84e /clientloop.c | |
parent | 8db70e2398ff1830e18533a75c6e8e5fa98a78e2 (diff) |
- (djm) OpenBSD CVS Sync
- stevesk@cvs.openbsd.org 2005/12/28 22:46:06
[canohost.c channels.c clientloop.c]
use 'break-in' for consistency; ok deraadt@ ok and input jmc@
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clientloop.c b/clientloop.c index 04f2d11be..a71552cad 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -59,7 +59,7 @@ | |||
59 | */ | 59 | */ |
60 | 60 | ||
61 | #include "includes.h" | 61 | #include "includes.h" |
62 | RCSID("$OpenBSD: clientloop.c,v 1.147 2005/12/07 03:52:22 djm Exp $"); | 62 | RCSID("$OpenBSD: clientloop.c,v 1.148 2005/12/28 22:46:06 stevesk Exp $"); |
63 | 63 | ||
64 | #include "ssh.h" | 64 | #include "ssh.h" |
65 | #include "ssh1.h" | 65 | #include "ssh1.h" |
@@ -1688,7 +1688,7 @@ client_request_x11(const char *request_type, int rchan) | |||
1688 | 1688 | ||
1689 | if (!options.forward_x11) { | 1689 | if (!options.forward_x11) { |
1690 | error("Warning: ssh server tried X11 forwarding."); | 1690 | error("Warning: ssh server tried X11 forwarding."); |
1691 | error("Warning: this is probably a break in attempt by a malicious server."); | 1691 | error("Warning: this is probably a break-in attempt by a malicious server."); |
1692 | return NULL; | 1692 | return NULL; |
1693 | } | 1693 | } |
1694 | originator = packet_get_string(NULL); | 1694 | originator = packet_get_string(NULL); |
@@ -1721,7 +1721,7 @@ client_request_agent(const char *request_type, int rchan) | |||
1721 | 1721 | ||
1722 | if (!options.forward_agent) { | 1722 | if (!options.forward_agent) { |
1723 | error("Warning: ssh server tried agent forwarding."); | 1723 | error("Warning: ssh server tried agent forwarding."); |
1724 | error("Warning: this is probably a break in attempt by a malicious server."); | 1724 | error("Warning: this is probably a break-in attempt by a malicious server."); |
1725 | return NULL; | 1725 | return NULL; |
1726 | } | 1726 | } |
1727 | sock = ssh_get_authentication_socket(); | 1727 | sock = ssh_get_authentication_socket(); |