tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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:
Ben Lindstrom 2001-06-05 19:37:25 +00:00
parent 608d1d1f9b
commit 1bfe29151b
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -19,6 +19,11 @@
- markus@cvs.openbsd.org 2001/05/19 16:08:43 - markus@cvs.openbsd.org 2001/05/19 16:08:43
[sshd.8] [sshd.8]
sort options; Matthew.Stier@fnc.fujitsu.com 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 20010528
- (tim) [conifgure.in] add setvbuf test needed for sftp-int.c - (tim) [conifgure.in] add setvbuf test needed for sftp-int.c
@ -5449,4 +5454,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - 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
View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 .Dd September 25, 1999
.Dt SSH 1 .Dt SSH 1
.Os .Os
@ -812,7 +812,7 @@ The argument must be
or or
.Dq no . .Dq no .
The default is The default is
.Dq yes . .Dq no .
This option applies to protocol version 2 only and This option applies to protocol version 2 only and
is similar to is similar to
.Cm RhostsRSAAuthentication . .Cm RhostsRSAAuthentication .
@ -925,7 +925,7 @@ authentication methods. This allows a client to prefer one method (e.g.
over another method (e.g. over another method (e.g.
.Cm password ) .Cm password )
The default for this option is: The default for this option is:
.Dq publickey,password,keyboard-interactive .Dq publickey,hostbased,password,keyboard-interactive
.It Cm Protocol .It Cm Protocol
Specifies the protocol versions Specifies the protocol versions
.Nm .Nm

10
sshconnect2.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #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/bn.h>
#include <openssl/md5.h> #include <openssl/md5.h>
@ -202,6 +202,10 @@ Authmethod authmethods[] = {
userauth_pubkey, userauth_pubkey,
&options.pubkey_authentication, &options.pubkey_authentication,
NULL}, NULL},
{"hostbased",
userauth_hostbased,
&options.hostbased_authentication,
NULL},
{"password", {"password",
userauth_passwd, userauth_passwd,
&options.password_authentication, &options.password_authentication,
@ -210,10 +214,6 @@ Authmethod authmethods[] = {
userauth_kbdint, userauth_kbdint,
&options.kbd_interactive_authentication, &options.kbd_interactive_authentication,
&options.batch_mode}, &options.batch_mode},
{"hostbased",
userauth_hostbased,
&options.hostbased_authentication,
NULL},
{"none", {"none",
userauth_none, userauth_none,
NULL, NULL,