- markus@cvs.openbsd.org 2001/05/19 16:32:16
[ssh.1 sshconnect2.c] change preferredauthentication order to publickey,hostbased,password,keyboard-interactive document that hostbased defaults to no, document order
This commit is contained in:
parent
608d1d1f9b
commit
1bfe29151b
|
@ -19,6 +19,11 @@
|
|||
- markus@cvs.openbsd.org 2001/05/19 16:08:43
|
||||
[sshd.8]
|
||||
sort options; Matthew.Stier@fnc.fujitsu.com
|
||||
- markus@cvs.openbsd.org 2001/05/19 16:32:16
|
||||
[ssh.1 sshconnect2.c]
|
||||
change preferredauthentication order to
|
||||
publickey,hostbased,password,keyboard-interactive
|
||||
document that hostbased defaults to no, document order
|
||||
|
||||
20010528
|
||||
- (tim) [conifgure.in] add setvbuf test needed for sftp-int.c
|
||||
|
@ -5449,4 +5454,4 @@
|
|||
- Wrote replacements for strlcpy and mkdtemp
|
||||
- Released 1.0pre1
|
||||
|
||||
$Id: ChangeLog,v 1.1231 2001/06/05 19:33:22 mouring Exp $
|
||||
$Id: ChangeLog,v 1.1232 2001/06/05 19:37:25 mouring Exp $
|
||||
|
|
6
ssh.1
6
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
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue