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

Merge pull request #4566 from laf/fix-ad-auth

Browse Source 
fix: AD auth stop alerts being generated
This commit is contained in:
Neil Lathwood
2016-09-25 10:41:14 +01:00
committed by GitHub
parent e91d529063 00d59362f2
commit 0c0c553d74
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
html/includes/functions.inc.php
View File

@ -1343,23 +1343,3 @@ function ipmiSensorName($hardwareId, $sensorIpmi, $rewriteArray)
return $sensorIpmi;
}
}
function get_auth_ad_user_filter($username)
{
global $config;
$user_filter = "(samaccountname=$username)";
if ($config['auth_ad_user_filter']) {
$user_filter = "(&{$config['auth_ad_user_filter']}$user_filter)";
}
return $user_filter;
}
function get_auth_ad_group_filter($groupname)
{
global $config;
$group_filter = "(samaccountname=$groupname)";
if ($config['auth_ad_group_filter']) {
$group_filter = "(&{$config['auth_ad_group_filter']}$group_filter)";
}
return $group_filter;
}

20
includes/common.php
View File

@ -1460,3 +1460,23 @@ function starts_with($haystack, $needles, $case_insensitive = false)
}
return false;
}
function get_auth_ad_user_filter($username)
{
global $config;
$user_filter = "(samaccountname=$username)";
if ($config['auth_ad_user_filter']) {
$user_filter = "(&{$config['auth_ad_user_filter']}$user_filter)";
}
return $user_filter;
}
function get_auth_ad_group_filter($groupname)
{
global $config;
$group_filter = "(samaccountname=$groupname)";
if ($config['auth_ad_group_filter']) {
$group_filter = "(&{$config['auth_ad_group_filter']}$group_filter)";
}
return $group_filter;
}