Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2020-03-07 21:35:34 -06:00
commit 21c5aa3de3

View File

@ -2122,6 +2122,15 @@ class SSH2
{ {
$args = func_get_args(); $args = func_get_args();
$this->auth[] = $args; $this->auth[] = $args;
// try logging with 'none' as an authentication method first since that's what
// PuTTY does
if ($this->_login($username)) {
return true;
}
if (count($args) == 1) {
return false;
}
return call_user_func_array(array(&$this, '_login'), $args); return call_user_func_array(array(&$this, '_login'), $args);
} }