diff options
author | Jason Gerard DeRose <jderose@redhat.com> | 2009-12-09 09:09:53 -0700 |
---|---|---|
committer | Jason Gerard DeRose <jderose@redhat.com> | 2009-12-10 08:29:15 -0700 |
commit | b6e4972e7f6aa08e0392a2cf441b60ab0e7d88b7 (patch) | |
tree | 7e5329a51af169ce34a7d275a1bbd63c1e31c026 /ipalib/plugins/hbac.py | |
parent | d08b8858ddc3bf6265f6ea8acae6661b9fff5112 (diff) | |
download | freeipa.git-b6e4972e7f6aa08e0392a2cf441b60ab0e7d88b7.tar.gz freeipa.git-b6e4972e7f6aa08e0392a2cf441b60ab0e7d88b7.tar.xz freeipa.git-b6e4972e7f6aa08e0392a2cf441b60ab0e7d88b7.zip |
Take 2: Extensible return values and validation; steps toward a single output_for_cli(); enable more webUI stuff
Diffstat (limited to 'ipalib/plugins/hbac.py')
-rw-r--r-- | ipalib/plugins/hbac.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/ipalib/plugins/hbac.py b/ipalib/plugins/hbac.py index 4a7cc940..6dc13f6d 100644 --- a/ipalib/plugins/hbac.py +++ b/ipalib/plugins/hbac.py @@ -35,7 +35,7 @@ class hbac(LDAPObject): default_attributes = [ 'cn', 'accessruletype', 'ipaenabledflag', 'servicename', 'accesstime', 'description', - + ] uuid_attribute = 'ipauniqueid' attribute_names = { @@ -128,7 +128,7 @@ class hbac_add(LDAPCreate): if not dn.startswith('cn='): msg = 'HBAC rule with name "%s" already exists' % keys[-1] raise errors.DuplicateEntry(message=msg) - # HBAC rules are enabled by default + # HBAC rules are enabled by default entry_attrs['ipaenabledflag'] = 'TRUE' return ldap.make_dn( entry_attrs, self.obj.uuid_attribute, self.obj.container_dn @@ -184,7 +184,7 @@ class hbac_enable(LDAPQuery): except errors.EmptyModlist: pass - return True + return dict(result=True) def output_for_cli(self, textui, result, cn): textui.print_name(self.name) @@ -208,7 +208,7 @@ class hbac_disable(LDAPQuery): except errors.EmptyModlist: pass - return True + return dict(result=True) def output_for_cli(self, textui, result, cn): textui.print_name(self.name) @@ -242,7 +242,7 @@ class hbac_add_accesstime(LDAPQuery): except errors.EmptyModlist: pass - return True + return dict(result=True) def output_for_cli(self, textui, result, cn, **options): textui.print_name(self.name) @@ -280,7 +280,7 @@ class hbac_remove_accesstime(LDAPQuery): except (ValueError, errors.EmptyModlist): pass - return True + return dict(result=True) def output_for_cli(self, textui, result, cn, **options): textui.print_name(self.name) @@ -351,5 +351,3 @@ class hbac_remove_sourcehost(LDAPRemoveMember): member_count_out = ('%i object removed.', '%i objects removed.') api.register(hbac_remove_sourcehost) - - |