RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-01-23 18:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2002/06/21 05:50:51

Browse Source 
[monitor.c]
     Don't initialise compression buffers when compression=no in sshd_config;
     ok Niels@
This commit is contained in:
Damien Miller 2002-06-21 15:59:49 +10:00
parent 90ac0b5945
commit 2d6b83353b
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,11 @@
20020621
- (djm) Sync:
- djm@cvs.openbsd.org 2002/06/21 05:50:51
[monitor.c]
Don't initialise compression buffers when compression=no in sshd_config;
ok Niels@
20020620 20020620
- (bal) Fixed AIX environment handling, use setpcred() instead of existing - (bal) Fixed AIX environment handling, use setpcred() instead of existing
code. (Bugzilla Bug 261) code. (Bugzilla Bug 261)
@ -986,4 +994,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (djm) ssh-keygen -i needs seeded RNG; report from markus@
$Id: ChangeLog,v 1.2234 2002/06/21 01:38:53 mouring Exp $ $Id: ChangeLog,v 1.2235 2002/06/21 05:59:49 djm Exp $

21
monitor.c
View File

@ -25,7 +25,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: monitor.c,v 1.15 2002/06/19 18:01:00 markus Exp $"); RCSID("$OpenBSD: monitor.c,v 1.16 2002/06/21 05:50:51 djm Exp $");
#include <openssl/dh.h> #include <openssl/dh.h>
@ -327,8 +327,10 @@ monitor_child_postauth(struct monitor *pmonitor)
void void
monitor_sync(struct monitor *pmonitor) monitor_sync(struct monitor *pmonitor)
{ {
/* The member allocation is not visible, so sync it */ if (options.compression) {
mm_share_sync(&pmonitor->m_zlib, &pmonitor->m_zback); /* The member allocation is not visible, so sync it */
mm_share_sync(&pmonitor->m_zlib, &pmonitor->m_zback);
}
} }
int int
@ -1330,7 +1332,8 @@ monitor_apply_keystate(struct monitor *pmonitor)
sizeof(outgoing_stream)); sizeof(outgoing_stream));
/* Update with new address */ /* Update with new address */
mm_init_compression(pmonitor->m_zlib); if (options.compression)
mm_init_compression(pmonitor->m_zlib);
/* Network I/O buffers */ /* Network I/O buffers */
/* XXX inefficient for large buffers, need: buffer_init_from_string */ /* XXX inefficient for large buffers, need: buffer_init_from_string */
@ -1515,11 +1518,13 @@ monitor_init(void)
mon->m_sendfd = pair[1]; mon->m_sendfd = pair[1];
/* Used to share zlib space across processes */ /* Used to share zlib space across processes */
mon->m_zback = mm_create(NULL, MM_MEMSIZE); if (options.compression) {
mon->m_zlib = mm_create(mon->m_zback, 20 * MM_MEMSIZE); mon->m_zback = mm_create(NULL, MM_MEMSIZE);
mon->m_zlib = mm_create(mon->m_zback, 20 * MM_MEMSIZE);
/* Compression needs to share state across borders */ /* Compression needs to share state across borders */
mm_init_compression(mon->m_zlib); mm_init_compression(mon->m_zlib);
}
return mon; return mon;
} }