summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ipalib/plugins/baseldap.py3
-rw-r--r--ipalib/plugins/dns.py13
-rw-r--r--ipalib/plugins/host.py3
3 files changed, 16 insertions, 3 deletions
diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py
index 011d6262..5805ba9b 100644
--- a/ipalib/plugins/baseldap.py
+++ b/ipalib/plugins/baseldap.py
@@ -169,9 +169,6 @@ global_output_params = (
Str('memberservice',
label=_('Failed service/service groups'),
),
- Str('managedby',
- label=_('Failed managedby'),
- ),
Str('failed',
label=_('Failed to remove'),
flags=['suppress_empty'],
diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py
index 991eb016..bd637dcd 100644
--- a/ipalib/plugins/dns.py
+++ b/ipalib/plugins/dns.py
@@ -1531,6 +1531,12 @@ def default_zone_update_policy(zone):
else:
return get_dns_forward_zone_update_policy(api.env.realm)
+dnszone_output_params = (
+ Str('managedby',
+ label=_('Managedby permission'),
+ ),
+)
+
class dnszone(LDAPObject):
"""
DNS Zone, container for resource records.
@@ -1717,6 +1723,7 @@ api.register(dnszone)
class dnszone_add(LDAPCreate):
__doc__ = _('Create new DNS zone (SOA record).')
+ has_output_params = LDAPCreate.has_output_params + dnszone_output_params
takes_options = LDAPCreate.takes_options + (
Flag('force',
label=_('Force'),
@@ -1783,12 +1790,16 @@ api.register(dnszone_del)
class dnszone_mod(LDAPUpdate):
__doc__ = _('Modify DNS zone (SOA record).')
+ has_output_params = LDAPUpdate.has_output_params + dnszone_output_params
+
api.register(dnszone_mod)
class dnszone_find(LDAPSearch):
__doc__ = _('Search for DNS zones (SOA records).')
+ has_output_params = LDAPSearch.has_output_params + dnszone_output_params
+
def args_options_2_params(self, *args, **options):
# FIXME: Check that name_from_ip is valid. This is necessary because
# custom validation rules, including _validate_ipnet, are not
@@ -1833,6 +1844,8 @@ api.register(dnszone_find)
class dnszone_show(LDAPRetrieve):
__doc__ = _('Display information about a DNS zone (SOA record).')
+ has_output_params = LDAPRetrieve.has_output_params + dnszone_output_params
+
api.register(dnszone_show)
diff --git a/ipalib/plugins/host.py b/ipalib/plugins/host.py
index a417ba0f..319bdf72 100644
--- a/ipalib/plugins/host.py
+++ b/ipalib/plugins/host.py
@@ -172,6 +172,9 @@ host_output_params = (
Str('revocation_reason?',
label=_('Revocation reason'),
),
+ Str('managedby',
+ label=_('Failed managedby'),
+ ),
)
def validate_ipaddr(ugettext, ipaddr):