Mercurial > dropbear

comparison options.h @ 119:3394a7cb30cd private-rez

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate of 08347df3bca787bd3621602fe2b466c85c9dc3e2 and 717950f4061f1123659ee87c7c168805af920ab7 from branch 'matt.dbclient.rez' to 'matt.dbclient.authpam'
author Matt Johnston <matt@ucc.asn.au>
date Sun, 12 Sep 2004 05:52:36 +0000
parents 5312ca05ed48
children 9337c9f9a607
comparison
equal deleted inserted replaced
118:5312ca05ed48 119:3394a7cb30cd
110 #define MOTD_FILENAME "/etc/motd" 110 #define MOTD_FILENAME "/etc/motd"
111 #endif 111 #endif
112 112
113 /* Authentication types to enable, at least one required. 113 /* Authentication types to enable, at least one required.
114 RFC Draft requires pubkey auth, and recommends password */ 114 RFC Draft requires pubkey auth, and recommends password */
115 //#define DROPBEAR_PASSWORD_AUTH 115 /*#define ENABLE_SVR_PASSWORD_AUTH*/
116 /* Only set PAM auth if you aren't using PASSWORD auth. Also, you'll need 116 /* Only set PAM auth if you aren't using SVR_PASSWORD_AUTH. Also, you'll need
117 * to make sure PAM libraries etc are installed */ 117 * to make sure PAM libraries etc are installed. To the client, PAM auth looks
118 #define DROPBEAR_PAM_AUTH 118 * just like password auth. */
119 #define DROPBEAR_PUBKEY_AUTH 119 #define ENABLE_SVR_PAM_AUTH
120 #define ENABLE_SVR_PASSWORD_AUTH
121 #define ENABLE_SVR_PUBKEY_AUTH 120 #define ENABLE_SVR_PUBKEY_AUTH
122 121
123 #define ENABLE_CLI_PASSWORD_AUTH 122 #define ENABLE_CLI_PASSWORD_AUTH
124 #define ENABLE_CLI_PUBKEY_AUTH 123 #define ENABLE_CLI_PUBKEY_AUTH
125 124
176 /******************************************************************* 175 /*******************************************************************
177 * You shouldn't edit below here unless you know you need to. 176 * You shouldn't edit below here unless you know you need to.
178 *******************************************************************/ 177 *******************************************************************/
179 178
180 #ifndef DROPBEAR_VERSION 179 #ifndef DROPBEAR_VERSION
181 #define DROPBEAR_VERSION "0.44test3" 180 #define DROPBEAR_VERSION "0.44rez1"
182 #endif 181 #endif
183 182
184 #define LOCAL_IDENT "SSH-2.0-dropbear_" DROPBEAR_VERSION 183 #define LOCAL_IDENT "SSH-2.0-dropbear_" DROPBEAR_VERSION
185 #define PROGNAME "dropbear" 184 #define PROGNAME "dropbear"
186 185
325 324
326 #if defined(DROPBEAR_CLIENT) || defined(ENABLE_SVR_PUBKEY_AUTH) 325 #if defined(DROPBEAR_CLIENT) || defined(ENABLE_SVR_PUBKEY_AUTH)
327 #define DROPBEAR_KEY_LINES /* ie we're using authorized_keys or known_hosts */ 326 #define DROPBEAR_KEY_LINES /* ie we're using authorized_keys or known_hosts */
328 #endif 327 #endif
329 328
329 #if defined(ENABLE_SVR_PASSWORD_AUTH) && defined(ENABLE_SVR_PAM_AUTH)
330 #error "You can't turn on PASSWORD and PAM auth both at once. Fix it in options.h"
331 #endif
332
330 /* We use dropbear_client and dropbear_server as shortcuts to avoid redundant 333 /* We use dropbear_client and dropbear_server as shortcuts to avoid redundant
331 * code, if we're just compiling as client or server */ 334 * code, if we're just compiling as client or server */
332 #if defined(DROPBEAR_SERVER) && defined(DROPBEAR_CLIENT) 335 #if defined(DROPBEAR_SERVER) && defined(DROPBEAR_CLIENT)
333 336
334 #define IS_DROPBEAR_SERVER (ses.isserver == 1) 337 #define IS_DROPBEAR_SERVER (ses.isserver == 1)