summaryrefslogtreecommitdiffstats
path: root/ssh.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-05 07:52:57 +0100
committerBen Lindstrom <mouring@eviladmin.org>2001-03-05 07:52:57 +0100
commit4040fe10a9fb735bf75670522d11408ee654f74d (patch)
tree617770678c1374ae3b1c56ebe423ede7ab9db3f0 /ssh.c
parent - deraadt@cvs.openbsd.org 2001/03/01 03:38:33 (diff)
downloadopenssh-4040fe10a9fb735bf75670522d11408ee654f74d.tar.xz
openssh-4040fe10a9fb735bf75670522d11408ee654f74d.zip
- markus@cvs.openbsd.org 2001/03/01 22:46:37
[ssh.c] don't truncate remote ssh-2 commands; from mkubita@securities.cz use min, not max for logging, fixes overflow.
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/ssh.c b/ssh.c
index cf6b03796..c76c7bb71 100644
--- a/ssh.c
+++ b/ssh.c
@@ -39,7 +39,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.99 2001/03/01 02:29:04 deraadt Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.100 2001/03/01 22:46:37 markus Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
@@ -936,7 +936,8 @@ client_subsystem_reply(int type, int plen, void *ctxt)
id = packet_get_int();
len = buffer_len(&command);
- len = MAX(len, 900);
+ if (len > 900)
+ len = 900;
packet_done();
if (type == SSH2_MSG_CHANNEL_FAILURE)
fatal("Request for subsystem '%.*s' failed on channel %d",
@@ -1009,7 +1010,7 @@ ssh_session2_callback(int id, void *arg)
debug("Sending command: %.*s", len, buffer_ptr(&command));
channel_request_start(id, "exec", 0);
}
- packet_put_string(buffer_ptr(&command), len);
+ packet_put_string(buffer_ptr(&command), buffer_len(&command));
packet_send();
} else {
channel_request(id, "shell", 0);