danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2024-11-30 04:39:21 +01:00
Code Issues Projects Releases Wiki Activity

System/SSH/Agent: add parameter to constructor

Browse Source
This commit is contained in:
terrafrost 2018-12-01 22:41:45 -06:00
parent 8f2a0e6f0d
commit fbef6f009f
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
phpseclib/System/SSH/Agent.php
View File

@ -352,18 +352,20 @@ class System_SSH_Agent
* @return System_SSH_Agent
* @access public
*/
function __construct()
function __construct($address = null)
{
switch (true) {
case isset($_SERVER['SSH_AUTH_SOCK']):
$address = $_SERVER['SSH_AUTH_SOCK'];
break;
case isset($_ENV['SSH_AUTH_SOCK']):
$address = $_ENV['SSH_AUTH_SOCK'];
break;
default:
user_error('SSH_AUTH_SOCK not found');
return false;
if (!$address) {
switch (true) {
case isset($_SERVER['SSH_AUTH_SOCK']):
$address = $_SERVER['SSH_AUTH_SOCK'];
break;
case isset($_ENV['SSH_AUTH_SOCK']):
$address = $_ENV['SSH_AUTH_SOCK'];
break;
default:
user_error('SSH_AUTH_SOCK not found');
return false;
}
}
$this->fsock = fsockopen('unix://' . $address, 0, $errno, $errstr);
@ -378,9 +380,9 @@ class System_SSH_Agent
* @see self::__construct()
* @access public
*/
function System_SSH_Agent()
function System_SSH_Agent($address = null)
{
$this->__construct();
$this->__construct($address);
}
/**