comparison sysoptions.h @ 606:e4991659fc10

merge of '8a608f0ed5e4b491dba4bf330e560636ec7376fd' and 'b31879a384d3bf8cbcbe2ed731d7d79d49799b1d'
author Matt Johnston <matt@ucc.asn.au>
date Mon, 28 Feb 2011 13:51:34 +0000
parents 810dfc792ca9 53c21d4ec98a
children aa2f51a6b81d
comparison
equal deleted inserted replaced
604:810dfc792ca9 606:e4991659fc10
176 176
177 #if defined(DROPBEAR_CLIENT) || defined(ENABLE_SVR_PUBKEY_AUTH) 177 #if defined(DROPBEAR_CLIENT) || defined(ENABLE_SVR_PUBKEY_AUTH)
178 #define DROPBEAR_KEY_LINES /* ie we're using authorized_keys or known_hosts */ 178 #define DROPBEAR_KEY_LINES /* ie we're using authorized_keys or known_hosts */
179 #endif 179 #endif
180 180
181 /* Changing this is inadvisable, it appears to have problems
182 * with flushing compressed data */
183 #define DROPBEAR_ZLIB_MEM_LEVEL 8
184
181 #if defined(ENABLE_SVR_PASSWORD_AUTH) && defined(ENABLE_SVR_PAM_AUTH) 185 #if defined(ENABLE_SVR_PASSWORD_AUTH) && defined(ENABLE_SVR_PAM_AUTH)
182 #error "You can't turn on PASSWORD and PAM auth both at once. Fix it in options.h" 186 #error "You can't turn on PASSWORD and PAM auth both at once. Fix it in options.h"
183 #endif 187 #endif
184 188
185 #if defined(DROPBEAR_RANDOM_DEV) && defined(DROPBEAR_PRNGD_SOCKET) 189 #if defined(DROPBEAR_RANDOM_DEV) && defined(DROPBEAR_PRNGD_SOCKET)