From 88471e845a1c108b6e4770472bdfb076afae9962 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 14 Sep 2006 20:08:29 +0000 Subject: [PATCH] added error message for invalid lamdaemon admin users --- lam/lib/lamdaemon.inc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lam/lib/lamdaemon.inc b/lam/lib/lamdaemon.inc index baffe9d5..24b3ef77 100644 --- a/lam/lib/lamdaemon.inc +++ b/lam/lib/lamdaemon.inc @@ -112,10 +112,17 @@ function lamdaemonSSH($commands) { $credentials = $_SESSION['ldap']->decrypt_login(); $handle = ssh2_connect($_SESSION['config']->scriptServer); if ($handle) { - $sr = ldap_read($_SESSION['ldap']->server(), $credentials[0], "objectClass=posixAccount", array('uid')); - $entry = ldap_get_entries($_SESSION['ldap']->server(), $sr); + $sr = @ldap_read($_SESSION['ldap']->server(), $credentials[0], "objectClass=posixAccount", array('uid')); + if (!$sr) { + $return = array("ERROR," . _("Your LAM admin user must be a valid Unix account to work with lamdaemon!") . ","); + return $return; + } + $entry = @ldap_get_entries($_SESSION['ldap']->server(), $sr); $userName = $entry[0]['uid'][0]; - if (!$userName) return array(); + if (!$userName) { + $return = array("ERROR," . _("Your LAM admin user must be a valid Unix account to work with lamdaemon!") . ","); + return $return; + } if (@ssh2_auth_password($handle, $userName, $credentials[1])) { $shell = ssh2_exec($handle, "sudo " . $_SESSION['config']->scriptPath); fwrite($shell, $commands);