summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Zeleny <jzeleny@redhat.com>2011-01-13 17:32:57 +0100
committerRob Crittenden <rcritten@redhat.com>2011-02-14 11:32:03 -0500
commit25c5c43ed4a22ac5527c3574be9a5a7515385cd5 (patch)
tree7bb30a70d869822b6c375c18b404de059e5ac73f
parent856d890bb37a9a793fdcbe0884d1e7286aeec1f5 (diff)
downloadfreeipa-25c5c43ed4a22ac5527c3574be9a5a7515385cd5.tar.gz
freeipa-25c5c43ed4a22ac5527c3574be9a5a7515385cd5.tar.xz
freeipa-25c5c43ed4a22ac5527c3574be9a5a7515385cd5.zip
Changed dns permission types
Recent change of DNS module to version caused that dns object type was replaced by dnszone and dnsrecord. This patch corrects dns types in permissions class. https://fedorahosted.org/freeipa/ticket/646
-rw-r--r--ipalib/plugins/aci.py4
-rw-r--r--ipalib/plugins/permission.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/ipalib/plugins/aci.py b/ipalib/plugins/aci.py
index 903c600b3..336f16f68 100644
--- a/ipalib/plugins/aci.py
+++ b/ipalib/plugins/aci.py
@@ -137,7 +137,7 @@ _type_map = {
'hostgroup': 'ldap:///cn=*,%s,%s' % (api.env.container_hostgroup, api.env.basedn),
'service': 'ldap:///krbprincipalname=*,%s,%s' % (api.env.container_service, api.env.basedn),
'netgroup': 'ldap:///ipauniqueid=*,%s,%s' % (api.env.container_netgroup, api.env.basedn),
- 'dns': 'ldap:///idnsname=*,%s,%s' % (api.env.container_dns, api.env.basedn),
+ 'dnsrecord': 'ldap:///idnsname=*,%s,%s' % (api.env.container_dns, api.env.basedn),
}
_valid_permissions_values = [
@@ -443,7 +443,7 @@ class aci(Object):
cli_name='type',
label=_('Type'),
doc=_('type of IPA object (user, group, host, hostgroup, service, netgroup)'),
- values=(u'user', u'group', u'host', u'service', u'hostgroup', u'netgroup', u'dns',),
+ values=(u'user', u'group', u'host', u'service', u'hostgroup', u'netgroup', u'dnsrecord'),
),
Str('memberof?',
cli_name='memberof',
diff --git a/ipalib/plugins/permission.py b/ipalib/plugins/permission.py
index 61aba5260..784b4dae5 100644
--- a/ipalib/plugins/permission.py
+++ b/ipalib/plugins/permission.py
@@ -128,7 +128,7 @@ class permission(LDAPObject):
cli_name='type',
label=_('Type'),
doc=_('Type of IPA object (user, group, host, hostgroup, service, netgroup, dns)'),
- values=(u'user', u'group', u'host', u'service', u'hostgroup', u'netgroup', u'dns',),
+ values=(u'user', u'group', u'host', u'service', u'hostgroup', u'netgroup', u'dnsrecord',),
flags=('ask_create', 'ask_update'),
),
Str('memberof?',