summaryrefslogtreecommitdiff
path: root/sshconnect2.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-08-06 20:57:11 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-08-06 20:57:11 +0000
commit45350e83746e958d3ee2a375fb3c9d8f79f61650 (patch)
tree9c7eab1edb1c51b0e6b8ce9d3a8f5e5b27589afb /sshconnect2.c
parentc8e29ceb683e32c86523d9b8349cfab01d2c00ce (diff)
- markus@cvs.openbsd.org 2001/07/23 09:06:28
[sshconnect2.c] reorder default sequence of userauth methods to match ssh behaviour: hostbased,publickey,keyboard-interactive,password
Diffstat (limited to 'sshconnect2.c')
-rw-r--r--sshconnect2.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sshconnect2.c b/sshconnect2.c
index 2e2452801..a86d0036b 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: sshconnect2.c,v 1.80 2001/06/26 20:14:11 markus Exp $"); 26RCSID("$OpenBSD: sshconnect2.c,v 1.81 2001/07/23 09:06:28 markus Exp $");
27 27
28#include <openssl/bn.h> 28#include <openssl/bn.h>
29#include <openssl/md5.h> 29#include <openssl/md5.h>
@@ -195,22 +195,22 @@ static Authmethod *authmethod_lookup(const char *name);
195static char *authmethods_get(void); 195static char *authmethods_get(void);
196 196
197Authmethod authmethods[] = { 197Authmethod authmethods[] = {
198 {"publickey",
199 userauth_pubkey,
200 &options.pubkey_authentication,
201 NULL},
202 {"hostbased", 198 {"hostbased",
203 userauth_hostbased, 199 userauth_hostbased,
204 &options.hostbased_authentication, 200 &options.hostbased_authentication,
205 NULL}, 201 NULL},
206 {"password", 202 {"publickey",
207 userauth_passwd, 203 userauth_pubkey,
208 &options.password_authentication, 204 &options.pubkey_authentication,
209 &options.batch_mode}, 205 NULL},
210 {"keyboard-interactive", 206 {"keyboard-interactive",
211 userauth_kbdint, 207 userauth_kbdint,
212 &options.kbd_interactive_authentication, 208 &options.kbd_interactive_authentication,
213 &options.batch_mode}, 209 &options.batch_mode},
210 {"password",
211 userauth_passwd,
212 &options.password_authentication,
213 &options.batch_mode},
214 {"none", 214 {"none",
215 userauth_none, 215 userauth_none,
216 NULL, 216 NULL,