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

Trickle the group_cn to group_dn down the layers. Fix controller calls.

Browse Source
This commit is contained in:
Kevin McCarthy
2007-10-03 18:21:41 -07:00
parent f023f38616
commit 2ac1b39f42
3 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ipa-python/ipaclient.py
View File

@@ -202,69 +202,69 @@ class IPAClient:
return groups
def add_member_to_group(self, member_dn, group_cn):
def add_member_to_group(self, member_dn, group_dn):
"""Add a member to an existing group.
"""
return self.transport.add_member_to_group(member_dn, group_cn)
return self.transport.add_member_to_group(member_dn, group_dn)
def add_members_to_group(self, member_dns, group_cn):
def add_members_to_group(self, member_dns, group_dn):
"""Add several members to an existing group.
member_dns is a list of dns to add
Returns a list of the dns that were not added.
"""
return self.transport.add_members_to_group(member_dns, group_cn)
return self.transport.add_members_to_group(member_dns, group_dn)
def remove_member_from_group(self, member_dn, group_cn):
def remove_member_from_group(self, member_dn, group_dn):
"""Remove a member from an existing group.
"""
return self.transport.remove_member_from_group(member_dn, group_cn)
return self.transport.remove_member_from_group(member_dn, group_dn)
def remove_members_from_group(self, member_dns, group_cn):
def remove_members_from_group(self, member_dns, group_dn):
"""Remove several members from an existing group.
member_dns is a list of dns to remove
Returns a list of the dns that were not removed.
"""
return self.transport.remove_members_from_group(member_dns, group_cn)
return self.transport.remove_members_from_group(member_dns, group_dn)
def add_user_to_group(self, user_uid, group_cn):
def add_user_to_group(self, user_uid, group_dn):
"""Add a user to an existing group.
user is a uid of the user to add
group is the cn of the group to be added to
"""
return self.transport.add_user_to_group(user_uid, group_cn)
return self.transport.add_user_to_group(user_uid, group_dn)
def add_users_to_group(self, user_uids, group_cn):
def add_users_to_group(self, user_uids, group_dn):
"""Add several users to an existing group.
user_uids is a list of uids of the users to add
Returns a list of the user uids that were not added.
"""
return self.transport.add_users_to_group(user_uids, group_cn)
return self.transport.add_users_to_group(user_uids, group_dn)
def remove_user_from_group(self, user_uid, group_cn):
def remove_user_from_group(self, user_uid, group_dn):
"""Remove a user from an existing group.
user is a uid of the user to remove
group is the cn of the group to be removed from
"""
return self.transport.remove_user_from_group(user_uid, group_cn)
return self.transport.remove_user_from_group(user_uid, group_dn)
def remove_users_from_group(self, user_uids, group_cn):
def remove_users_from_group(self, user_uids, group_dn):
"""Remove several users from an existing group.
user_uids is a list of uids of the users to remove
Returns a list of the user uids that were not removed.
"""
return self.transport.remove_users_from_group(user_uids, group_cn)
return self.transport.remove_users_from_group(user_uids, group_dn)
def add_groups_to_user(self, group_dns, user_dn):
"""Given a list of group dn's add them to the user.

32
ipa-python/rpcclient.py
View File

@@ -342,12 +342,12 @@ class RPCClient:
return ipautil.unwrap_binary_data(result)
def add_member_to_group(self, member_dn, group_cn):
def add_member_to_group(self, member_dn, group_dn):
"""Add a new member to an existing group.
"""
server = self.setup_server()
try:
result = server.add_member_to_group(member_dn, group_cn)
result = server.add_member_to_group(member_dn, group_dn)
except xmlrpclib.Fault, fault:
raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
except socket.error, (value, msg):
@@ -355,7 +355,7 @@ class RPCClient:
return ipautil.unwrap_binary_data(result)
def add_members_to_group(self, member_dns, group_cn):
def add_members_to_group(self, member_dns, group_dn):
"""Add several members to an existing group.
member_dns is a list of the dns to add
@@ -363,7 +363,7 @@ class RPCClient:
"""
server = self.setup_server()
try:
result = server.add_members_to_group(member_dns, group_cn)
result = server.add_members_to_group(member_dns, group_dn)
except xmlrpclib.Fault, fault:
raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
except socket.error, (value, msg):
@@ -371,12 +371,12 @@ class RPCClient:
return ipautil.unwrap_binary_data(result)
def remove_member_from_group(self, member_dn, group_cn):
def remove_member_from_group(self, member_dn, group_dn):
"""Remove a member from an existing group.
"""
server = self.setup_server()
try:
result = server.remove_member_from_group(member_dn, group_cn)
result = server.remove_member_from_group(member_dn, group_dn)
except xmlrpclib.Fault, fault:
raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
except socket.error, (value, msg):
@@ -384,14 +384,14 @@ class RPCClient:
return ipautil.unwrap_binary_data(result)
def remove_members_from_group(self, member_dns, group_cn):
def remove_members_from_group(self, member_dns, group_dn):
"""Remove several members from an existing group.
Returns a list of the dns that were not removed.
"""
server = self.setup_server()
try:
result = server.remove_members_from_group(member_dns, group_cn)
result = server.remove_members_from_group(member_dns, group_dn)
except xmlrpclib.Fault, fault:
raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
except socket.error, (value, msg):
@@ -399,12 +399,12 @@ class RPCClient:
return ipautil.unwrap_binary_data(result)
def add_user_to_group(self, user_uid, group_cn):
def add_user_to_group(self, user_uid, group_dn):
"""Add a user to an existing group.
"""
server = self.setup_server()
try:
result = server.add_user_to_group(user_uid, group_cn)
result = server.add_user_to_group(user_uid, group_dn)
except xmlrpclib.Fault, fault:
raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
except socket.error, (value, msg):
@@ -412,7 +412,7 @@ class RPCClient:
return ipautil.unwrap_binary_data(result)
def add_users_to_group(self, user_uids, group_cn):
def add_users_to_group(self, user_uids, group_dn):
"""Add several users to an existing group.
user_uids is a list of the uids of the users to add
@@ -420,7 +420,7 @@ class RPCClient:
"""
server = self.setup_server()
try:
result = server.add_users_to_group(user_uids, group_cn)
result = server.add_users_to_group(user_uids, group_dn)
except xmlrpclib.Fault, fault:
raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
except socket.error, (value, msg):
@@ -428,12 +428,12 @@ class RPCClient:
return ipautil.unwrap_binary_data(result)
def remove_user_from_group(self, user_uid, group_cn):
def remove_user_from_group(self, user_uid, group_dn):
"""Remove a user from an existing group.
"""
server = self.setup_server()
try:
result = server.remove_user_from_group(user_uid, group_cn)
result = server.remove_user_from_group(user_uid, group_dn)
except xmlrpclib.Fault, fault:
raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
except socket.error, (value, msg):
@@ -441,7 +441,7 @@ class RPCClient:
return ipautil.unwrap_binary_data(result)
def remove_users_from_group(self, user_uids, group_cn):
def remove_users_from_group(self, user_uids, group_dn):
"""Remove several users from an existing group.
user_uids is a list of the uids of the users to remove
@@ -449,7 +449,7 @@ class RPCClient:
"""
server = self.setup_server()
try:
result = server.remove_users_from_group(user_uids, group_cn)
result = server.remove_users_from_group(user_uids, group_dn)
except xmlrpclib.Fault, fault:
raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
except socket.error, (value, msg):

8
ipa-server/ipa-gui/ipagui/controllers.py
View File

@@ -701,7 +701,7 @@ class Root(controllers.RootController):
if not(isinstance(dnadds,list) or isinstance(dnadds,tuple)):
dnadds = [dnadds]
failed_adds = client.add_members_to_group(
utf8_encode_values(dnadds), kw.get('cn'))
utf8_encode_values(dnadds), group.dn)
kw['dnadd'] = failed_adds
except ipaerror.IPAError, e:
failed_adds = dnadds
@@ -797,7 +797,7 @@ class Root(controllers.RootController):
return dict(form=group_edit_form, group=group_dict, members=member_dicts)
except ipaerror.IPAError, e:
turbogears.flash("Group edit failed: " + str(e))
raise turbogears.redirect('/groupshow', uid=kw.get('cn'))
raise turbogears.redirect('/groupshow', uid=cn)
@expose()
@identity.require(identity.not_anonymous())
@@ -859,7 +859,7 @@ class Root(controllers.RootController):
if not(isinstance(dnadds,list) or isinstance(dnadds,tuple)):
dnadds = [dnadds]
failed_adds = client.add_members_to_group(
utf8_encode_values(dnadds), kw.get('cn'))
utf8_encode_values(dnadds), new_group.dn)
kw['dnadd'] = failed_adds
except ipaerror.IPAError, e:
turbogears.flash("Group update failed: " + str(e))
@@ -876,7 +876,7 @@ class Root(controllers.RootController):
if not(isinstance(dndels,list) or isinstance(dndels,tuple)):
dndels = [dndels]
failed_dels = client.remove_members_from_group(
utf8_encode_values(dndels), kw.get('cn'))
utf8_encode_values(dndels), new_group.dn)
kw['dndel'] = failed_dels
except ipaerror.IPAError, e:
turbogears.flash("Group update failed: " + str(e))