mirror of
https://github.com/phpseclib/phpseclib.git
synced 2024-12-26 19:40:28 +00:00
Merge branch '1.0' into 2.0
This commit is contained in:
commit
4eb477051c
@ -2125,12 +2125,14 @@ class SSH2
|
|||||||
|
|
||||||
// try logging with 'none' as an authentication method first since that's what
|
// try logging with 'none' as an authentication method first since that's what
|
||||||
// PuTTY does
|
// PuTTY does
|
||||||
|
if (substr($this->server_identifier, 0, 13) != 'SSH-2.0-CoreFTP') {
|
||||||
if ($this->_login($username)) {
|
if ($this->_login($username)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (count($args) == 1) {
|
if (count($args) == 1) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return call_user_func_array(array(&$this, '_login'), $args);
|
return call_user_func_array(array(&$this, '_login'), $args);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user