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
This commit is contained in:
1 parent
07059a5ef2
commit
bde9959091
8 files changed
+126
-16
No files matched your search
@@ -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]
|
||||
|
||||
|
||||
@@ -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):
|
||||
|
||||
Reference in new issue
Block a user