Author: jfthomps
Date: Fri Jan 16 06:08:21 2009
New Revision: 735021

URL: http://svn.apache.org/viewvc?rev=735021&view=rev
Log:
VCL-54
all remaining places where and ldap_bind occurs had a call added to 
ldap_set_option to disable LDAP referrals

authentication.php:
ldapLogin modified

utils.php
checkAccess and ldapUIDLookup modified

authmethods/ldapauth.php
updateEXAMPLE2Groups modified

Modified:
    incubator/vcl/trunk/web/.ht-inc/authentication.php
    incubator/vcl/trunk/web/.ht-inc/authmethods/ldapauth.php
    incubator/vcl/trunk/web/.ht-inc/utils.php

Modified: incubator/vcl/trunk/web/.ht-inc/authentication.php
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/authentication.php?rev=735021&r1=735020&r2=735021&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/authentication.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/authentication.php Fri Jan 16 06:08:21 2009
@@ -344,12 +344,11 @@
                return;
        }
        ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
+       ldap_set_option($ds, LDAP_OPT_REFERRALS, 0);
        /*if($authtype == 'EXAMPLE1 LDAP') {
                # in this case, we have to look up what part of the tree the 
user is in
                #   before we can actually look up the user
                $auth = $authMechs[$authtype];
-               ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
-               ldap_set_option($ds, LDAP_OPT_REFERRALS, 0);
                $res = ldap_bind($ds, $auth['masterlogin'],
                                 $auth['masterpwd']);
                if(! $res) {

Modified: incubator/vcl/trunk/web/.ht-inc/authmethods/ldapauth.php
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/authmethods/ldapauth.php?rev=735021&r1=735020&r2=735021&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/authmethods/ldapauth.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/authmethods/ldapauth.php Fri Jan 16 
06:08:21 2009
@@ -459,6 +459,7 @@
        if(! $ds)
                return 0;
        ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
+       ldap_set_option($ds, LDAP_OPT_REFERRALS, 0);
 
        $res = ldap_bind($ds, $auth['masterlogin'],
                          $auth['masterpwd']);

Modified: incubator/vcl/trunk/web/.ht-inc/utils.php
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/web/.ht-inc/utils.php?rev=735021&r1=735020&r2=735021&view=diff
==============================================================================
--- incubator/vcl/trunk/web/.ht-inc/utils.php (original)
+++ incubator/vcl/trunk/web/.ht-inc/utils.php Fri Jan 16 06:08:21 2009
@@ -393,6 +393,7 @@
                                        exit;
                                }
                                ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 
3);
+                               ldap_set_option($ds, LDAP_OPT_REFERRALS, 0);
                                $ldapuser = 
sprintf($authMechs[$authtype]['userid'], $user['unityid']);
                                $res = ldap_bind($ds, $ldapuser, $xmlpass);
                                if(! $res) {
@@ -932,6 +933,7 @@
                return FALSE;
        }
 
+       ldap_set_option($ldapConnect, LDAP_OPT_REFERRALS, 0);
        $result = ldap_bind($ldapConnect, $ldaprdn, $ldappass);
        if(!$result) {
                $error['op'] = "ldapUIDLookup";


Reply via email to