From bde9959091d263402c2016c183f8617dea488cc0 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Thu, 27 Mar 2008 09:54:41 -0400 Subject: When getting members let user indicate what type of member they want. The memberOf attribute includes members that are directly in the group via the "member" attribute and those that are included as a result of being in a group that is in the group. The UI needs to be able to distinguish between the two. 438706 --- ipa-python/ipaclient.py | 4 ++-- ipa-python/rpcclient.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ipa-python') diff --git a/ipa-python/ipaclient.py b/ipa-python/ipaclient.py index b685be38..4fc83695 100644 --- a/ipa-python/ipaclient.py +++ b/ipa-python/ipaclient.py @@ -326,11 +326,11 @@ class IPAClient: return self.transport.get_all_attrs() - def group_members(self, groupdn, attr_list): + def group_members(self, groupdn, attr_list, membertype): """Do a memberOf search of groupdn and return the attributes in attr_list (an empty list returns everything).""" - results = self.transport.group_members(groupdn, attr_list) + results = self.transport.group_members(groupdn, attr_list, membertype) counter = results[0] diff --git a/ipa-python/rpcclient.py b/ipa-python/rpcclient.py index 7fa075b1..1c8e751b 100644 --- a/ipa-python/rpcclient.py +++ b/ipa-python/rpcclient.py @@ -611,7 +611,7 @@ class RPCClient: return ipautil.unwrap_binary_data(result) - def group_members(self, groupdn, attr_list=None): + def group_members(self, groupdn, attr_list=None, memberstype=0): """Do a memberOf search of groupdn and return the attributes in attr_list (an empty list returns everything).""" @@ -620,7 +620,7 @@ class RPCClient: server = self.setup_server() try: - result = server.group_members(groupdn, attr_list) + result = server.group_members(groupdn, attr_list, memberstype) except xmlrpclib.Fault, fault: raise ipaerror.gen_exception(fault.faultCode, fault.faultString) except socket.error, (value, msg): -- cgit