From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 1 Nov 2017 19:15:46 +0000 (+0000)
Subject: ldap: Cleanup function names and return values
X-Git-Url: http://git.ipfire.org/?p=pbs.git;a=commitdiff_plain;h=3ddfed9ba99097b58893f4427d1eb78791d86d72

ldap: Cleanup function names and return values

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/buildservice/ldap.py b/src/buildservice/ldap.py
index 44f7c7c..ca32930 100644
--- a/src/buildservice/ldap.py
+++ b/src/buildservice/ldap.py
@@ -53,39 +53,31 @@ class LDAP(base.Object):
 		return True 
 
 	def get_dn_by_uid(self, uid):
-		dn, attrs = self.get_user(uid, attrlist=["uid"])
+		dn, attrs = self.get_user_by_uid(uid, attrlist=["uid"])
 
-		if not dn:
-			return
-
-		log.debug("DN for uid %s is: %s" % (uid, dn))
 		return dn
 
 	def get_dn_by_mail(self, mail):
-		result = self.search("(&(objectClass=posixAccount)(mail=%s))" % mail, limit=1, attrlist=["uid"])
-
-		for dn, attrs in result:
-			return dn
+		dn, attrs = self.get_user_by_mail(mail, attrlist=["uid"])
 
-		log.debug("DN for mail %s is: %s" % (mail, dn))
-		return None
+		return dn
 
 	def get_dn(self, name):
 		return self.get_dn_by_uid(name) or self.get_dn_by_mail(name)
 
-	def get_user_by_mail(self, mail, **kwargs):
-		result = self.search("(&(objectClass=posixAccount)(mail=%s))" % mail, limit=1, **kwargs)
+	def get_user_by_uid(self, uid, **kwargs):
+		result = self.search("(&(objectClass=posixAccount)(uid=%s))" % uid, limit=1, **kwargs)
 		for dn, attrs in result:
-			return (dn, attrs)
+			return dn, attrs
 
-		return None
+		return None, None
 
-	def get_user_by_dn(self, uid, **kwargs):
-		result = self.search("(&(objectClass=posixAccount)(uid=%s))" % uid, limit=1, **kwargs)
+	def get_user_by_mail(self, mail, **kwargs):
+		result = self.search("(&(objectClass=posixAccount)(mail=%s))" % mail, limit=1, **kwargs)
 		for dn, attrs in result:
-			return (dn, attrs)
+			return dn, attrs
 
-		return None
+		return None, None
 
 	def get_user(self, name, **kwargs):
 		return self.get_user_by_dn(name, **kwargs) or self.get_user_by_mail(name, **kwargs)