diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-08-06 20:57:11 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-08-06 20:57:11 +0000 |
commit | 45350e83746e958d3ee2a375fb3c9d8f79f61650 (patch) | |
tree | 9c7eab1edb1c51b0e6b8ce9d3a8f5e5b27589afb | |
parent | c8e29ceb683e32c86523d9b8349cfab01d2c00ce (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
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sshconnect2.c | 18 |
2 files changed, 14 insertions, 10 deletions
@@ -13,6 +13,10 @@ | |||
13 | - markus@cvs.openbsd.org 2001/07/22 22:24:16 | 13 | - markus@cvs.openbsd.org 2001/07/22 22:24:16 |
14 | [sshd.8] | 14 | [sshd.8] |
15 | Xr login.conf | 15 | Xr login.conf |
16 | - markus@cvs.openbsd.org 2001/07/23 09:06:28 | ||
17 | [sshconnect2.c] | ||
18 | reorder default sequence of userauth methods to match ssh behaviour: | ||
19 | hostbased,publickey,keyboard-interactive,password | ||
16 | 20 | ||
17 | 20010803 | 21 | 20010803 |
18 | - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on | 22 | - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on |
@@ -6123,4 +6127,4 @@ | |||
6123 | - Wrote replacements for strlcpy and mkdtemp | 6127 | - Wrote replacements for strlcpy and mkdtemp |
6124 | - Released 1.0pre1 | 6128 | - Released 1.0pre1 |
6125 | 6129 | ||
6126 | $Id: ChangeLog,v 1.1429 2001/08/06 20:55:28 mouring Exp $ | 6130 | $Id: ChangeLog,v 1.1430 2001/08/06 20:57:11 mouring Exp $ |
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" |
26 | RCSID("$OpenBSD: sshconnect2.c,v 1.80 2001/06/26 20:14:11 markus Exp $"); | 26 | RCSID("$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); | |||
195 | static char *authmethods_get(void); | 195 | static char *authmethods_get(void); |
196 | 196 | ||
197 | Authmethod authmethods[] = { | 197 | Authmethod 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, |