Adds manager and direct reports to usershow page.

Fixes a bug with the group by member where is wasn't trapping not found errors.

2 files changed, 17 insertions, 2 deletions

diff --git a/ipa-server/xmlrpc-server/funcs.py b/ipa-server/xmlrpc-server/funcs.py
index 2f9606d0f..d226ac863 100644
--- a/ipa-server/xmlrpc-server/funcs.py
+++ b/ipa-server/xmlrpc-server/funcs.py
@@ -308,7 +308,18 @@ class IPAServer:
 
         filter = "(objectClass=*)"
         return self.__get_entry(dn, filter, sattrs, opts)
-    
+
+    def get_users_by_manager (self, manager_dn, sattrs=None, opts=None):
+        """Gets the users that report to a particular manager.
+        """
+
+        filter = "(&(objectClass=person)(manager=%s))" % manager_dn
+
+        try:
+            return self.__get_list(self.basedn, filter, sattrs, opts)
+        except ipaerror.exception_for(ipaerror.LDAP_NOT_FOUND):
+            return []
+
     def add_user (self, user, user_container=None, opts=None):
         """Add a user in LDAP. Takes as input a dict where the key is the
            attribute name and the value is either a string or in the case
@@ -601,7 +612,10 @@ class IPAServer:
 
         filter = "(&(objectClass=posixGroup)(uniqueMember=%s))" % member_dn
 
-        return self.__get_list(self.basedn, filter, sattrs, opts)
+        try:
+            return self.__get_list(self.basedn, filter, sattrs, opts)
+        except ipaerror.exception_for(ipaerror.LDAP_NOT_FOUND):
+            return []
 
     def add_group (self, group, group_container=None, opts=None):
         """Add a group in LDAP. Takes as input a dict where the key is the
diff --git a/ipa-server/xmlrpc-server/ipaxmlrpc.py b/ipa-server/xmlrpc-server/ipaxmlrpc.py
index baeb50707..aa9044642 100644
--- a/ipa-server/xmlrpc-server/ipaxmlrpc.py
+++ b/ipa-server/xmlrpc-server/ipaxmlrpc.py
@@ -316,6 +316,7 @@ def handler(req, profiling=False):
             h = ModXMLRPCRequestHandler()
             h.register_function(f.get_user_by_uid)
             h.register_function(f.get_user_by_dn)
+            h.register_function(f.get_users_by_manager)
             h.register_function(f.add_user)
             h.register_function(f.get_add_schema)
             h.register_function(f.get_all_users)