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 | |
parent | 3b66d27383ad89774c5d06f54c1f419a709fa863 (diff) | |
download | freeipa.git-27f0aab6672fe02622ebae0e35ed86e45b51d2e9.tar.gz freeipa.git-27f0aab6672fe02622ebae0e35ed86e45b51d2e9.tar.xz freeipa.git-27f0aab6672fe02622ebae0e35ed86e45b51d2e9.zip |
Rename memberOf to group_members in xml-rpc interface.
-rw-r--r-- | ipa-admintools/ipa-findgroup | 2 | ||||
-rw-r--r-- | ipa-python/ipaclient.py | 4 | ||||
-rw-r--r-- | ipa-python/rpcclient.py | 4 | ||||
-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 |
6 files changed, 9 insertions, 9 deletions
diff --git a/ipa-admintools/ipa-findgroup b/ipa-admintools/ipa-findgroup index a263ba64..cd295a24 100644 --- a/ipa-admintools/ipa-findgroup +++ b/ipa-admintools/ipa-findgroup @@ -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) diff --git a/ipa-python/ipaclient.py b/ipa-python/ipaclient.py index 9d0bf9b2..659ff995 100644 --- a/ipa-python/ipaclient.py +++ b/ipa-python/ipaclient.py @@ -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] diff --git a/ipa-python/rpcclient.py b/ipa-python/rpcclient.py index 7f87ac04..871c3725 100644 --- a/ipa-python/rpcclient.py +++ b/ipa-python/rpcclient.py @@ -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): diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/group.py b/ipa-server/ipa-gui/ipagui/subcontrollers/group.py index c3048f0d..88fb60bb 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 9f878004..17a578c2 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 86327365..6aaad117 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 |