diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2001-05-19 16:32:17 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2001-05-19 16:32:17 +0000 |
| commit | 886d909e9f80ae4a52b2b96ac3c2284cf71e57fe (patch) | |
| tree | 75fb9b11ad60ad2bc80e8621d46138aae298af2a /usr.bin/ssh | |
| parent | 04183d2c5d494d71b33a9e6ac71218fb39327760 (diff) | |
change preferredauthentication order to
publickey,hostbased,password,keyboard-interactive
document that hostbased defaults to no, document order
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/ssh.1 | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/sshconnect2.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1 index 433d41e7825..da1a4c7bdc3 100644 --- a/usr.bin/ssh/ssh.1 +++ b/usr.bin/ssh/ssh.1 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh.1,v 1.111 2001/05/17 21:34:15 markus Exp $ +.\" $OpenBSD: ssh.1,v 1.112 2001/05/19 16:32:16 markus Exp $ .Dd September 25, 1999 .Dt SSH 1 .Os @@ -812,7 +812,7 @@ The argument must be or .Dq no . The default is -.Dq yes . +.Dq no . This option applies to protocol version 2 only and is similar to .Cm RhostsRSAAuthentication . @@ -925,7 +925,7 @@ authentication methods. This allows a client to prefer one method (e.g. over another method (e.g. .Cm password ) The default for this option is: -.Dq publickey,password,keyboard-interactive +.Dq publickey,hostbased,password,keyboard-interactive .It Cm Protocol Specifies the protocol versions .Nm diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index 75bd53d0877..5b354010d25 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/sshconnect2.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect2.c,v 1.73 2001/05/18 14:13:29 markus Exp $"); +RCSID("$OpenBSD: sshconnect2.c,v 1.74 2001/05/19 16:32:16 markus Exp $"); #include <openssl/bn.h> #include <openssl/md5.h> @@ -202,6 +202,10 @@ Authmethod authmethods[] = { userauth_pubkey, &options.pubkey_authentication, NULL}, + {"hostbased", + userauth_hostbased, + &options.hostbased_authentication, + NULL}, {"password", userauth_passwd, &options.password_authentication, @@ -210,10 +214,6 @@ Authmethod authmethods[] = { userauth_kbdint, &options.kbd_interactive_authentication, &options.batch_mode}, - {"hostbased", - userauth_hostbased, - &options.hostbased_authentication, - NULL}, {"none", userauth_none, NULL, |