Changeset:
        ef7f8563f64f
        
https://sourceforge.net/p/mrbs/hg-code/ci/ef7f8563f64fd5820fd1d989b7868bc62f6accf5
Author:
        Campbell Morrison <[email protected]>
Date:
        Wed Feb 15 14:34:52 2017 +0000
Log message:

Fixed a namespace problem.  See SF Support Requests #1143.

diffstat:

 web/auth/auth_ldap.inc |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r abae2b322e39 -r ef7f8563f64f web/auth/auth_ldap.inc
--- a/web/auth/auth_ldap.inc    Mon Feb 13 13:56:46 2017 +0000
+++ b/web/auth/auth_ldap.inc    Wed Feb 15 14:34:52 2017 +0000
@@ -49,6 +49,8 @@
         "Please check your MRBS and web server configuration.</b></p><hr>\n");
   }
 
+  $ns_callback = __NAMESPACE__ . "\\$callback";
+  
   // Transfer the values from the config variables into a local
   // associative array, turning them all into arrays
   
@@ -229,8 +231,8 @@
       }
       else
       {
-        $res = $callback($ldap, $all_ldap_opts['ldap_base_dn'][$idx], $dn,
-                         $user_search, $user, $object);
+        $res = $ns_callback($ldap, $all_ldap_opts['ldap_base_dn'][$idx], $dn,
+                            $user_search, $user, $object);
         if ($res)
         {
           return $res;

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits

Reply via email to