summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-05-15 14:37:39 +1000
committerDamien Miller <djm@mindrot.org>2014-05-15 14:37:39 +1000
commitc31a0cd5b31961f01c5b731f62a6cb9d4f767472 (patch)
treef0ef8c1ba5c43751f91c355243142ab71f611e98 /monitor.c
parent686c7d9ee6f44b2be4128d7860b6b37adaeba733 (diff)
- markus@cvs.openbsd.org 2014/05/03 17:20:34
[monitor.c packet.c packet.h] unbreak compression, by re-init-ing the compression code in the post-auth child. the new buffer code is more strict, and requires buffer_init() while the old code was happy after a bzero(); originally from djm@
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/monitor.c b/monitor.c
index a38647d49..9391ae8d1 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor.c,v 1.132 2014/04/29 18:01:49 markus Exp $ */ 1/* $OpenBSD: monitor.c,v 1.133 2014/05/03 17:20:34 markus Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -1811,6 +1811,8 @@ monitor_apply_keystate(struct monitor *pmonitor)
1811 if (options.compression) 1811 if (options.compression)
1812 mm_init_compression(pmonitor->m_zlib); 1812 mm_init_compression(pmonitor->m_zlib);
1813 1813
1814 packet_set_postauth();
1815
1814 if (options.rekey_limit || options.rekey_interval) 1816 if (options.rekey_limit || options.rekey_interval)
1815 packet_set_rekey_limits((u_int32_t)options.rekey_limit, 1817 packet_set_rekey_limits((u_int32_t)options.rekey_limit,
1816 (time_t)options.rekey_interval); 1818 (time_t)options.rekey_interval);