WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes for new ssh2 extension

This commit is contained in:
Roland Gruber 2008-12-18 14:44:42 +00:00
parent 49a0222918
commit 11fd63d6a8
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lam/templates/tests/lamdaemonTest.php
View File

@ -137,6 +137,13 @@ function lamTestLamdaemon($command, $stopTest, $handle, $testText) {
flush(); flush();
$lamdaemonOk = false; $lamdaemonOk = false;
$shell = ssh2_exec($handle, "sudo " . $_SESSION['config']->get_scriptPath()); $shell = ssh2_exec($handle, "sudo " . $_SESSION['config']->get_scriptPath());
if (!$shell) {
echo "<td>" . $failImage . "&nbsp;&nbsp;</td>\n";
echo "<td>\n";
StatusMessage("ERROR", _("Unable to connect to remote server!"));
echo "</td>\n";
return true;
}
$stderr = ssh2_fetch_stream($shell, SSH2_STREAM_STDERR); $stderr = ssh2_fetch_stream($shell, SSH2_STREAM_STDERR);
fwrite($shell, $command); fwrite($shell, $command);
$return = array(); $return = array();
@ -161,6 +168,8 @@ function lamTestLamdaemon($command, $stopTest, $handle, $testText) {
elseif (strlen($errOut) > 0) { elseif (strlen($errOut) > 0) {
$return[] = "ERROR," . _("Unknown error") . "," . htmlspecialchars(str_replace(",", " ", $errOut)); $return[] = "ERROR," . _("Unknown error") . "," . htmlspecialchars(str_replace(",", " ", $errOut));
} }
@fclose($shell);
@fclose($stderr);
if ((sizeof($return) == 1) && (strpos(strtolower($return[0]), "error") === false)) { if ((sizeof($return) == 1) && (strpos(strtolower($return[0]), "error") === false)) {
$lamdaemonOk = true; $lamdaemonOk = true;
} }
@ -297,7 +306,11 @@ function lamRunLamdaemonTestSuite($serverName, $serverTitle, $testQuota) {
$stopTest = lamTestLamdaemon("+ test basic\n", $stopTest, $handle, _("Execute lamdaemon")); $stopTest = lamTestLamdaemon("+ test basic\n", $stopTest, $handle, _("Execute lamdaemon"));
if ($testQuota) { if ($testQuota) {
$handle = @ssh2_connect($serverName);
@ssh2_auth_password($handle, $userName, $credentials[1]);
$stopTest = lamTestLamdaemon("+ test quota\n", $stopTest, $handle, _("Lamdaemon: Quota module installed")); $stopTest = lamTestLamdaemon("+ test quota\n", $stopTest, $handle, _("Lamdaemon: Quota module installed"));
$handle = @ssh2_connect($serverName);
@ssh2_auth_password($handle, $userName, $credentials[1]);
$stopTest = lamTestLamdaemon("+ quota get user\n", $stopTest, $handle, _("Lamdaemon: read quotas")); $stopTest = lamTestLamdaemon("+ quota get user\n", $stopTest, $handle, _("Lamdaemon: read quotas"));
} }