IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename memberOf to group_members in xml-rpc interface.

Browse Source
This commit is contained in:
Karl MacMillan 0001-01-01 00:00:00 +00:00
parent 3b66d27383
commit 27f0aab667
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipa-admintools/ipa-findgroup
View File

@ -58,7 +58,7 @@ def main():
for ent in groups:
try:
members = client.memberOf(ent.dn, ['dn','cn'])
members = client.group_members(ent.dn, ['dn','cn'])
except ipa.ipaerror.IPAError, e:
print "Error getting members for " + ent.dn
print str(e)

4
ipa-python/ipaclient.py
View File

@ -317,11 +317,11 @@ class IPAClient:
return self.transport.attrs_to_labels(attrs)
def memberOf(self, groupdn, attr_list):
def group_members(self, groupdn, attr_list):
"""Do a memberOf search of groupdn and return the attributes in
attr_list (an empty list returns everything)."""
results = self.transport.memberOf(groupdn, attr_list)
results = self.transport.group_members(groupdn, attr_list)
counter = results[0]

4
ipa-python/rpcclient.py
View File

@ -575,7 +575,7 @@ class RPCClient:
return ipautil.unwrap_binary_data(result)
def memberOf(self, groupdn, attr_list=None):
def group_members(self, groupdn, attr_list=None):
"""Do a memberOf search of groupdn and return the attributes in
attr_list (an empty list returns everything)."""
@ -584,7 +584,7 @@ class RPCClient:
server = self.setup_server()
try:
result = server.memberOf(groupdn, attr_list)
result = server.group_members(groupdn, attr_list)
except xmlrpclib.Fault, fault:
raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
except socket.error, (value, msg):

4
ipa-server/ipa-gui/ipagui/subcontrollers/group.py
View File

@ -184,7 +184,7 @@ class GroupController(IPAController):
# convert members to users, for easier manipulation on the page
#
members = client.memberOf(group.dn, ['dn', 'givenname', 'sn', 'uid', 'cn'])
members = client.group_members(group.dn, ['dn', 'givenname', 'sn', 'uid', 'cn'])
members.sort(self.sort_group_member)
# Map users into an array of dicts, which can be serialized
@ -349,7 +349,7 @@ class GroupController(IPAController):
# convert members to users, for display on the page
#
members = client.memberOf(group.dn, ['dn', 'givenname', 'sn', 'uid', 'cn'])
members = client.group_members(group.dn, ['dn', 'givenname', 'sn', 'uid', 'cn'])
members = members[1:]
members.sort(self.sort_group_member)
member_dicts = map(lambda member: member.toDict(), members)

2
ipa-server/xmlrpc-server/funcs.py
View File

@ -1061,7 +1061,7 @@ class IPAServer:
return label_list
def memberOf(self, groupdn, attr_list, opts=None):
def group_members(self, groupdn, attr_list, opts=None):
"""Do a memberOf search of groupdn and return the attributes in
attr_list (an empty list returns everything)."""

2
ipa-server/xmlrpc-server/ipaxmlrpc.py
View File

@ -350,7 +350,7 @@ def handler(req, profiling=False):
h.register_function(f.update_group)
h.register_function(f.delete_group)
h.register_function(f.attrs_to_labels)
h.register_function(f.memberOf)
h.register_function(f.group_members)
h.handle_request(req)
finally:
pass