diff options
| author | Karl MacMillan <kmacmillan@mentalrootkit.com> | 2007-10-31 16:36:56 -0400 |
|---|---|---|
| committer | Karl MacMillan <kmacmillan@mentalrootkit.com> | 2007-10-31 16:36:56 -0400 |
| commit | 27f0aab6672fe02622ebae0e35ed86e45b51d2e9 (patch) | |
| tree | 14f6dabce0250c618c610a2348c8cf5014adf9be /ipa-server | |
| parent | 3b66d27383ad89774c5d06f54c1f419a709fa863 (diff) | |
| download | freeipa-27f0aab6672fe02622ebae0e35ed86e45b51d2e9.tar.gz freeipa-27f0aab6672fe02622ebae0e35ed86e45b51d2e9.tar.xz freeipa-27f0aab6672fe02622ebae0e35ed86e45b51d2e9.zip | |
Rename memberOf to group_members in xml-rpc interface.
Diffstat (limited to 'ipa-server')
| -rw-r--r-- | ipa-server/ipa-gui/ipagui/subcontrollers/group.py | 4 | ||||
| -rw-r--r-- | ipa-server/xmlrpc-server/funcs.py | 2 | ||||
| -rw-r--r-- | ipa-server/xmlrpc-server/ipaxmlrpc.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/group.py b/ipa-server/ipa-gui/ipagui/subcontrollers/group.py index c3048f0de..88fb60bb0 100644 --- a/ipa-server/ipa-gui/ipagui/subcontrollers/group.py +++ b/ipa-server/ipa-gui/ipagui/subcontrollers/group.py @@ -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) diff --git a/ipa-server/xmlrpc-server/funcs.py b/ipa-server/xmlrpc-server/funcs.py index 9f8780048..17a578c26 100644 --- a/ipa-server/xmlrpc-server/funcs.py +++ b/ipa-server/xmlrpc-server/funcs.py @@ -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).""" diff --git a/ipa-server/xmlrpc-server/ipaxmlrpc.py b/ipa-server/xmlrpc-server/ipaxmlrpc.py index 863273659..6aaad1170 100644 --- a/ipa-server/xmlrpc-server/ipaxmlrpc.py +++ b/ipa-server/xmlrpc-server/ipaxmlrpc.py @@ -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 |