From 510191db6885153a98350d1a3530834491e0b552 Mon Sep 17 00:00:00 2001
From: "Lorenzo M. Catucci" <lorenzo@sancho.ccd.uniroma2.it>
Date: Mon, 5 Nov 2012 15:38:49 +0100
Subject: [PATCH 1/2] Return true or false from readAttribute if $attr is empty

This way, readAttribute can act as an existence checker.
---
 apps/user_ldap/lib/access.php | 11 ++++++++---
 apps/user_ldap/user_ldap.php  |  5 ++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index f1e2143cfa..822e0b441c 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -40,9 +40,10 @@ abstract class Access {
 	 * @brief reads a given attribute for an LDAP record identified by a DN
 	 * @param $dn the record in question
 	 * @param $attr the attribute that shall be retrieved
-	 * @returns the values in an array on success, false otherwise
+	 *        if empty, just check the record's existence
+	 * @returns true or the values in an array on success, false otherwise
 	 *
-	 * Reads an attribute from an LDAP entry
+	 * Reads an attribute from an LDAP entry or check if entry exists
 	 */
 	public function readAttribute($dn, $attr, $filter = 'objectClass=*') {
 		if(!$this->checkConnection()) {
@@ -57,10 +58,14 @@ abstract class Access {
 		}
 		$rr = @ldap_read($cr, $dn, $filter, array($attr));
 		if(!is_resource($rr)) {
-			\OCP\Util::writeLog('user_ldap', 'readAttribute '.$attr.' failed for DN '.$dn, \OCP\Util::DEBUG);
+			\OCP\Util::writeLog('user_ldap', 'readAttribute failed for DN '.$dn, \OCP\Util::DEBUG);
 			//in case an error occurs , e.g. object does not exist
 			return false;
 		}
+		if (empty($attr)) {
+			\OCP\Util::writeLog('user_ldap', 'readAttribute: '.$dn.' found', \OCP\Util::DEBUG);
+			return true;
+		}
 		$er = ldap_first_entry($cr, $rr);
 		if(!is_resource($er)) {
 			//did not match the filter, return false
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 69e470c78a..4c0893a510 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -149,9 +149,8 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 			return false;
 		}
 
-		//if user really still exists, we will be able to read his objectclass
-		$objcs = $this->readAttribute($dn, 'objectclass');
-		if(!$objcs || empty($objcs)) {
+		//check if user really still exists by reading its entry
+		if(!$this->readAttribute($dn, '') ) {
 			$this->connection->writeToCache('userExists'.$uid, false);
 			return false;
 		}

From ca24f4767b996bcded139dd9189592e57eade2a6 Mon Sep 17 00:00:00 2001
From: "Lorenzo M. Catucci" <lorenzo@sancho.ccd.uniroma2.it>
Date: Mon, 5 Nov 2012 17:35:09 +0100
Subject: [PATCH 2/2] Return an empty array on succesful existence check

---
 apps/user_ldap/lib/access.php | 5 +++--
 apps/user_ldap/user_ldap.php  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 822e0b441c..9cbb21ead0 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -41,7 +41,8 @@ abstract class Access {
 	 * @param $dn the record in question
 	 * @param $attr the attribute that shall be retrieved
 	 *        if empty, just check the record's existence
-	 * @returns true or the values in an array on success, false otherwise
+	 * @returns an array of values on success or an empty
+	 *          array if $attr is empty, false otherwise
 	 *
 	 * Reads an attribute from an LDAP entry or check if entry exists
 	 */
@@ -64,7 +65,7 @@ abstract class Access {
 		}
 		if (empty($attr)) {
 			\OCP\Util::writeLog('user_ldap', 'readAttribute: '.$dn.' found', \OCP\Util::DEBUG);
-			return true;
+			return array();
 		}
 		$er = ldap_first_entry($cr, $rr);
 		if(!is_resource($er)) {
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 4c0893a510..6591d1d5fe 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -150,7 +150,7 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 		}
 
 		//check if user really still exists by reading its entry
-		if(!$this->readAttribute($dn, '') ) {
+		if(!is_array($this->readAttribute($dn, ''))) {
 			$this->connection->writeToCache('userExists'.$uid, false);
 			return false;
 		}