summaryrefslogtreecommitdiff
path: root/serverloop.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-11-21 13:23:52 +1100
committerDamien Miller <djm@mindrot.org>1999-11-21 13:23:52 +1100
commit6162d1215bbff30cf0c4c19368dc85ae570d44ca (patch)
treef82956b4429cad04a2296a1ede65e147bafb92f4 /serverloop.c
parentf58db38f8d396ee5ea42975d9409a644e01cede8 (diff)
- OpenBSD CVS Changes
- [channels.c] make this compile, bad markus - [log.c readconf.c servconf.c ssh.h] bugfix: loglevels are per host in clientconfig, factor out common log-level parsing code. - [servconf.c] remove unused index (-Wall) - [ssh-agent.c] only one 'extern char *__progname' - [sshd.8] document SIGHUP, -Q to synopsis - [sshconnect.c serverloop.c sshd.c packet.c packet.h] [channels.c clientloop.c] SSH_CMSG_MAX_PACKET_SIZE, some clients use this, some need this, niels@ [hope this time my ISP stays alive during commit]
Diffstat (limited to 'serverloop.c')
-rw-r--r--serverloop.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/serverloop.c b/serverloop.c
index 2aec2cf19..9961170a5 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -176,8 +176,8 @@ void make_packets_from_stderr_data()
176 } 176 }
177 else 177 else
178 { 178 {
179 if (len > 32768) 179 if (len > packet_get_maxsize())
180 len = 32768; /* Keep the packets at reasonable size. */ 180 len = packet_get_maxsize(); /* Keep the packets at reasonable size. */
181 } 181 }
182 packet_start(SSH_SMSG_STDERR_DATA); 182 packet_start(SSH_SMSG_STDERR_DATA);
183 packet_put_string(buffer_ptr(&stderr_buffer), len); 183 packet_put_string(buffer_ptr(&stderr_buffer), len);
@@ -206,8 +206,8 @@ void make_packets_from_stdout_data()
206 } 206 }
207 else 207 else
208 { 208 {
209 if (len > 32768) 209 if (len > packet_get_maxsize())
210 len = 32768; /* Keep the packets at reasonable size. */ 210 len = packet_get_maxsize(); /* Keep the packets at reasonable size. */
211 } 211 }
212 packet_start(SSH_SMSG_STDOUT_DATA); 212 packet_start(SSH_SMSG_STDOUT_DATA);
213 packet_put_string(buffer_ptr(&stdout_buffer), len); 213 packet_put_string(buffer_ptr(&stdout_buffer), len);