mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avoid error on ldap bind when session has expired

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@596 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2010-01-05 20:06:24 +00:00
parent 7a1b6a688d
commit 181d0ee880
1 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
html/includes/authenticate.inc
View File

@@ -26,8 +26,10 @@ if($_COOKIE['username'] && $_COOKIE['password']){
$auth_success = 0; $auth_success = 0;
if ($config['auth_mechanism'] == "mysql" || !$config['auth_mechanism']) if ($_SESSION['username'])
{ {
if ($config['auth_mechanism'] == "mysql" || !$config['auth_mechanism'])
{
$encrypted = md5($_SESSION['password']); $encrypted = md5($_SESSION['password']);
$sql = "SELECT username FROM `users` WHERE `username`='".$_SESSION['username']."' AND `password`='".$encrypted."'"; $sql = "SELECT username FROM `users` WHERE `username`='".$_SESSION['username']."' AND `password`='".$encrypted."'";
$query = mysql_query($sql); $query = mysql_query($sql);
@@ -35,9 +37,9 @@ if ($config['auth_mechanism'] == "mysql" || !$config['auth_mechanism'])
if($row['username'] && $row['username'] == $_SESSION['username']) { if($row['username'] && $row['username'] == $_SESSION['username']) {
$auth_success = 1; $auth_success = 1;
} }
} }
else if ($config['auth_mechanism'] == "ldap") else if ($config['auth_mechanism'] == "ldap")
{ {
$ds=@ldap_connect($config['auth_ldap_server'],$config['auth_ldap_port']); $ds=@ldap_connect($config['auth_ldap_server'],$config['auth_ldap_port']);
if ($ds) if ($ds)
{ {
@@ -46,11 +48,12 @@ else if ($config['auth_mechanism'] == "ldap")
$auth_success = 1; $auth_success = 1;
} }
} }
} }
else else
{ {
echo "ERROR: no valid auth_mechanism defined."; echo "ERROR: no valid auth_mechanism defined.";
exit(); exit();
}
} }
if ($auth_success) { if ($auth_success) {