summaryrefslogtreecommitdiff
path: root/channels.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-11-21 23:48:55 +1100
committerDamien Miller <djm@mindrot.org>2003-11-21 23:48:55 +1100
commita8e06cef35c205e1aa562513c6d034a10c8c9a6d (patch)
treecf8bdb4466f553088c020b9179cabd6eaf196075 /channels.c
parent8c5e91c03fdd2693f0635f8b2a9904bffc94ce16 (diff)
- djm@cvs.openbsd.org 2003/11/21 11:57:03
[everything] unexpand and delete whitespace at EOL; ok markus@ (done locally and RCS IDs synced)
Diffstat (limited to 'channels.c')
-rw-r--r--channels.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/channels.c b/channels.c
index 060d0f507..4150b5504 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
39 */ 39 */
40 40
41#include "includes.h" 41#include "includes.h"
42RCSID("$OpenBSD: channels.c,v 1.197 2003/09/23 20:41:11 markus Exp $"); 42RCSID("$OpenBSD: channels.c,v 1.198 2003/11/21 11:57:03 djm Exp $");
43 43
44#include "ssh.h" 44#include "ssh.h"
45#include "ssh1.h" 45#include "ssh1.h"
@@ -970,7 +970,7 @@ channel_decode_socks5(Channel *c, fd_set * readset, fd_set * writeset)
970 have = buffer_len(&c->input); 970 have = buffer_len(&c->input);
971 if (!(c->flags & SSH_SOCKS5_AUTHDONE)) { 971 if (!(c->flags & SSH_SOCKS5_AUTHDONE)) {
972 /* format: ver | nmethods | methods */ 972 /* format: ver | nmethods | methods */
973 if (have < 2) 973 if (have < 2)
974 return 0; 974 return 0;
975 nmethods = p[1]; 975 nmethods = p[1];
976 if (have < nmethods + 2) 976 if (have < nmethods + 2)
@@ -1397,7 +1397,7 @@ channel_handle_wfd(Channel *c, fd_set * readset, fd_set * writeset)
1397 data = buffer_ptr(&c->output); 1397 data = buffer_ptr(&c->output);
1398 dlen = buffer_len(&c->output); 1398 dlen = buffer_len(&c->output);
1399#ifdef _AIX 1399#ifdef _AIX
1400 /* XXX: Later AIX versions can't push as much data to tty */ 1400 /* XXX: Later AIX versions can't push as much data to tty */
1401 if (compat20 && c->wfd_isatty && dlen > 8*1024) 1401 if (compat20 && c->wfd_isatty && dlen > 8*1024)
1402 dlen = 8*1024; 1402 dlen = 8*1024;
1403#endif 1403#endif