summaryrefslogtreecommitdiffstats
path: root/etc/inc/auth.inc
diff options
context:
space:
mode:
Diffstat (limited to 'etc/inc/auth.inc')
-rw-r--r--etc/inc/auth.inc16
1 files changed, 8 insertions, 8 deletions
diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc
index 44d8a5c..83fd02c 100644
--- a/etc/inc/auth.inc
+++ b/etc/inc/auth.inc
@@ -564,6 +564,8 @@ function ldap_get_user_ous($show_complete_ou=true, $authcfg) {
if(!function_exists("ldap_connect"))
return;
+ $ous = array();
+
if ($authcfg) {
if (strstr($authcfg['ldap_urltype'], "Standard"))
$ldapproto = "ldap";
@@ -585,8 +587,6 @@ function ldap_get_user_ous($show_complete_ou=true, $authcfg) {
} else
return false;
- $ous = array();
-
/* first check if there is even an LDAP server populated */
if(!$ldapserver) {
log_error("ERROR! ldap_get_user_ous() backed selected with no LDAP authentication server defined.");
@@ -629,8 +629,8 @@ function ldap_get_user_ous($show_complete_ou=true, $authcfg) {
else
$ldapfunc = "ldap_search";
- $search = $ldapfunc($ldap, $ldapbasedn, $ldapfilter);
- $info = ldap_get_entries($ldap, $search);
+ $search = @$ldapfunc($ldap, $ldapbasedn, $ldapfilter);
+ $info = @ldap_get_entries($ldap, $search);
if (is_array($info)) {
foreach ($info as $inf) {
@@ -743,8 +743,8 @@ function ldap_get_groups($username, $authcfg) {
else
$ldapfunc = "ldap_search";
- $search = $ldapfunc($ldap, $ldapdn, $ldapfilter, array($ldapgroupattribute));
- $info = ldap_get_entries($ldap, $search);
+ $search = @$ldapfunc($ldap, $ldapdn, $ldapfilter, array($ldapgroupattribute));
+ $info = @ldap_get_entries($ldap, $search);
$countem = $info["count"];
@@ -876,9 +876,9 @@ function ldap_backed($username, $passwd, $authcfg) {
$ldapfunc = "ldap_search";
/* Support legacy auth container specification. */
if (stristr($ldac_split, "DC="))
- $search = $ldapfunc($ldap,$ldac_split,$ldapfilter);
+ $search = @$ldapfunc($ldap,$ldac_split,$ldapfilter);
else
- $search = $ldapfunc($ldap,"{$ldac_split},{$ldapbasedn}",$ldapfilter);
+ $search = @$ldapfunc($ldap,"{$ldac_split},{$ldapbasedn}",$ldapfilter);
if (!$search) {
log_error("Search resulted in error: " . ldap_error($ldap));
continue;
OpenPOWER on IntegriCloud