comparison options.h @ 801:7dcb46da72d9 ecc

merge in HEAD
author Matt Johnston <matt@ucc.asn.au>
date Tue, 21 May 2013 12:09:35 +0800
parents 7f604f9b3756 ff6e551da826
children 34b73c9d8aa3
comparison
equal deleted inserted replaced
799:c344607b7341 801:7dcb46da72d9
157 #ifndef DROPBEAR_ZLIB_WINDOW_BITS 157 #ifndef DROPBEAR_ZLIB_WINDOW_BITS
158 #define DROPBEAR_ZLIB_WINDOW_BITS 15 158 #define DROPBEAR_ZLIB_WINDOW_BITS 15
159 #endif 159 #endif
160 160
161 /* Whether to do reverse DNS lookups. */ 161 /* Whether to do reverse DNS lookups. */
162 #define DO_HOST_LOOKUP 162 //#define DO_HOST_LOOKUP
163 163
164 /* Whether to print the message of the day (MOTD). This doesn't add much code 164 /* Whether to print the message of the day (MOTD). This doesn't add much code
165 * size */ 165 * size */
166 #define DO_MOTD 166 #define DO_MOTD
167 167
180 * PAM challenge/response. 180 * PAM challenge/response.
181 * You can't enable both PASSWORD and PAM. */ 181 * You can't enable both PASSWORD and PAM. */
182 182
183 #define ENABLE_SVR_PASSWORD_AUTH 183 #define ENABLE_SVR_PASSWORD_AUTH
184 /* PAM requires ./configure --enable-pam */ 184 /* PAM requires ./configure --enable-pam */
185 /*#define ENABLE_SVR_PAM_AUTH*/ 185 //#define ENABLE_SVR_PAM_AUTH
186 #define ENABLE_SVR_PUBKEY_AUTH 186 #define ENABLE_SVR_PUBKEY_AUTH
187 187
188 /* Whether to take public key options in 188 /* Whether to take public key options in
189 * authorized_keys file into account */ 189 * authorized_keys file into account */
190 #ifdef ENABLE_SVR_PUBKEY_AUTH 190 #ifdef ENABLE_SVR_PUBKEY_AUTH
207 * a helper program for the ssh client. The helper program should be 207 * a helper program for the ssh client. The helper program should be
208 * specified in the SSH_ASKPASS environment variable, and dbclient 208 * specified in the SSH_ASKPASS environment variable, and dbclient
209 * should be run with DISPLAY set and no tty. The program should 209 * should be run with DISPLAY set and no tty. The program should
210 * return the password on standard output */ 210 * return the password on standard output */
211 /*#define ENABLE_CLI_ASKPASS_HELPER*/ 211 /*#define ENABLE_CLI_ASKPASS_HELPER*/
212
213 /* Send a real auth request first rather than requesting a list of available methods.
214 * It saves a network round trip at login but prevents immediate login to
215 * accounts with no password, and might be rejected by some strict servers (none
216 * encountered yet) - hence it isn't enabled by default. */
217 /* #define CLI_IMMEDIATE_AUTH */
218
212 219
213 /* Source for randomness. This must be able to provide hundreds of bytes per SSH 220 /* Source for randomness. This must be able to provide hundreds of bytes per SSH
214 * connection without blocking. In addition /dev/random is used for seeding 221 * connection without blocking. In addition /dev/random is used for seeding
215 * rsa/dss key generation */ 222 * rsa/dss key generation */
216 #define DROPBEAR_URANDOM_DEV "/dev/urandom" 223 #define DROPBEAR_URANDOM_DEV "/dev/urandom"