summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2011-06-24 14:18:35 -0500
committerRob Crittenden <rcritten@redhat.com>2011-07-01 00:59:34 -0400
commit58eec70884fba522fe5865355351e906f07d228e (patch)
treea4a5bde7489ec41572b0c4c4f1c01cd8f987359a
parentc746abd63ac544273a2ddec44a3845e4eb880e62 (diff)
downloadfreeipa-58eec70884fba522fe5865355351e906f07d228e.zip
freeipa-58eec70884fba522fe5865355351e906f07d228e.tar.gz
freeipa-58eec70884fba522fe5865355351e906f07d228e.tar.xz
Removed invalid associations.
The following invalid associations have been removed: - group's memberindirect netgroup and role - hostgroup's memberofindirect host Ticket #1366 Ticket #1367
-rw-r--r--ipalib/plugins/group.py2
-rw-r--r--ipalib/plugins/hostgroup.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/ipalib/plugins/group.py b/ipalib/plugins/group.py
index e44ad7f..f369285 100644
--- a/ipalib/plugins/group.py
+++ b/ipalib/plugins/group.py
@@ -91,7 +91,7 @@ class group(LDAPObject):
attribute_members = {
'member': ['user', 'group'],
'memberof': ['group', 'netgroup', 'role', 'hbacrule', 'sudorule'],
- 'memberindirect': ['user', 'group', 'netgroup', 'role'],
+ 'memberindirect': ['user', 'group'],
'memberofindirect': ['group', 'netgroup', 'role', 'hbacrule',
'sudorule'],
}
diff --git a/ipalib/plugins/hostgroup.py b/ipalib/plugins/hostgroup.py
index abf01b4..c5b9605 100644
--- a/ipalib/plugins/hostgroup.py
+++ b/ipalib/plugins/hostgroup.py
@@ -67,7 +67,7 @@ class hostgroup(LDAPObject):
'member': ['host', 'hostgroup'],
'memberof': ['hostgroup', 'hbacrule', 'sudorule'],
'memberindirect': ['host', 'hostgroup'],
- 'memberofindirect': ['host', 'hostgroup', 'hbacrule', 'sudorule'],
+ 'memberofindirect': ['hostgroup', 'hbacrule', 'sudorule'],
}
label = _('Host Groups')