mirror of
https://github.com/phpseclib/phpseclib.git
synced 2025-01-01 05:31:53 +00:00
Merge branch '3.0'
This commit is contained in:
commit
90842f90fa
@ -417,8 +417,7 @@ class SFTP extends SSH2
|
||||
*/
|
||||
public function login($username, ...$args)
|
||||
{
|
||||
$this->auth[] = array_merge([$username], $args);
|
||||
if (!$this->sublogin($username, ...$args)) {
|
||||
if (!parent::login(...func_get_args())) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -2045,7 +2045,7 @@ class SSH2
|
||||
*/
|
||||
public function login($username, ...$args)
|
||||
{
|
||||
$this->auth[] = array_merge([$username], $args);
|
||||
$this->auth[] = func_get_args();
|
||||
|
||||
// try logging with 'none' as an authentication method first since that's what
|
||||
// PuTTY does
|
||||
|
Loading…
Reference in New Issue
Block a user