octoleo
/
phpseclib
mirror of https://github.com/phpseclib/phpseclib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0' into 3.0

This commit is contained in:
terrafrost 2020-03-09 20:02:17 -05:00
parent 2ba26e5490 63a76e88a1
commit ef04a176dd
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phpseclib/Net/SFTP.php
View File

@ -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;
}

2
phpseclib/Net/SSH2.php
View File

@ -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