From 2df267db2b222852f96a9eab08da2a9eea29d40c Mon Sep 17 00:00:00 2001
From: kevin_fourie <kevin_fourie@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Tue, 5 Jun 2007 15:16:42 +0000
Subject: [PATCH] Merged in from STABLE trunk...

---
 plugins/ktstandard/ldap/ldapbaseauthenticationprovider.inc.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/ktstandard/ldap/ldapbaseauthenticationprovider.inc.php b/plugins/ktstandard/ldap/ldapbaseauthenticationprovider.inc.php
index cad51b6..ca19024 100644
--- a/plugins/ktstandard/ldap/ldapbaseauthenticationprovider.inc.php
+++ b/plugins/ktstandard/ldap/ldapbaseauthenticationprovider.inc.php
@@ -618,7 +618,7 @@ class KTLDAPBaseAuthenticator extends Authenticator {
 
         $this->oLdap =& Net_LDAP::connect($config);
         if (PEAR::isError($this->oLdap)) {
-            return $oLdap;
+            return $this->oLdap;
         }
     }
 
@@ -637,11 +637,11 @@ class KTLDAPBaseAuthenticator extends Authenticator {
             'tls' => $this->bTls,
             'port'=> $this->iLdapPort
         );
-        $oLdap =& Net_LDAP::connect($config);
-        if (PEAR::isError($oLdap)) {
-            return $oLdap;
+        $this->oLdap =& Net_LDAP::connect($config);
+        if (PEAR::isError($this->oLdap)) {
+            return $this->oLdap;
         }
-        $res = $oLdap->reBind($dn, $sPassword);
+        $res = $this->oLdap->reBind($dn, $sPassword);
         return $res;
     }
 
@@ -665,11 +665,11 @@ class KTLDAPBaseAuthenticator extends Authenticator {
             'tls' => $this->bTls,
             'port'=> $this->iLdapPort
         );
-        $oLdap =& Net_LDAP::connect($config);
-        if (PEAR::isError($oLdap)) {
-            return $oLdap;
+        $this->oLdap =& Net_LDAP::connect($config);
+        if (PEAR::isError($this->oLdap)) {
+            return $this->oLdap;
         }
-        $res = $oLdap->reBind($dn, $sPassword);
+        $res = $this->oLdap->reBind($dn, $sPassword);
         if ($res === true) {
             return $dn;
         }
--
libgit2 0.21.4