From acede580e1f617af3f5205a490184781dd35b481 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Fri, 13 Dec 2013 15:54:57 +0100 Subject: Remove default from the ipapermlocation option The value from my machine ended up wired into API.txt, so builds on other machines would fail. Correct the mistake. --- API.txt | 6 +++--- ipalib/plugins/permission.py | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/API.txt b/API.txt index cc0c5440..342d7ed6 100644 --- a/API.txt +++ b/API.txt @@ -2237,7 +2237,7 @@ option: Str('attrs', attribute=False, cli_name='attrs', multivalue=True, require option: Str('filter', attribute=False, cli_name='filter', multivalue=True, required=False) option: Str('ipapermallowedattr', attribute=True, cli_name='attrs', multivalue=True, required=False) option: StrEnum('ipapermbindruletype', attribute=True, autofill=True, cli_name='bindtype', default=u'permission', multivalue=False, required=True, values=(u'permission',)) -option: DNOrURL('ipapermlocation', alwaysask=True, attribute=True, autofill=False, cli_name='subtree', default=ipapython.dn.DN('dc=idm,dc=lab,dc=eng,dc=brq,dc=redhat,dc=com'), multivalue=False, query=False, required=False) +option: DNOrURL('ipapermlocation', alwaysask=True, attribute=True, autofill=False, cli_name='subtree', multivalue=False, query=False, required=False) option: StrEnum('ipapermright', attribute=True, cli_name='permissions', multivalue=True, required=False, values=(u'read', u'search', u'compare', u'write', u'add', u'delete', u'all')) option: DNParam('ipapermtarget', attribute=True, cli_name='target', multivalue=False, required=False) option: Str('ipapermtargetfilter', attribute=True, cli_name='filter', multivalue=False, required=False) @@ -2293,7 +2293,7 @@ option: Str('cn', attribute=True, autofill=False, cli_name='name', multivalue=Fa option: Str('filter', attribute=False, autofill=False, cli_name='filter', multivalue=True, query=True, required=False) option: Str('ipapermallowedattr', attribute=True, autofill=False, cli_name='attrs', multivalue=True, query=True, required=False) option: StrEnum('ipapermbindruletype', attribute=True, autofill=False, cli_name='bindtype', default=u'permission', multivalue=False, query=True, required=False, values=(u'permission',)) -option: DNOrURL('ipapermlocation', attribute=True, autofill=False, cli_name='subtree', default=ipapython.dn.DN('dc=idm,dc=lab,dc=eng,dc=brq,dc=redhat,dc=com'), multivalue=False, query=True, required=False) +option: DNOrURL('ipapermlocation', attribute=True, autofill=False, cli_name='subtree', multivalue=False, query=True, required=False) option: StrEnum('ipapermright', attribute=True, autofill=False, cli_name='permissions', multivalue=True, query=True, required=False, values=(u'read', u'search', u'compare', u'write', u'add', u'delete', u'all')) option: DNParam('ipapermtarget', attribute=True, autofill=False, cli_name='target', multivalue=False, query=True, required=False) option: Str('ipapermtargetfilter', attribute=True, autofill=False, cli_name='filter', multivalue=False, query=True, required=False) @@ -2322,7 +2322,7 @@ option: Str('delattr*', cli_name='delattr', exclude='webui') option: Str('filter', attribute=False, autofill=False, cli_name='filter', multivalue=True, required=False) option: Str('ipapermallowedattr', attribute=True, autofill=False, cli_name='attrs', multivalue=True, required=False) option: StrEnum('ipapermbindruletype', attribute=True, autofill=False, cli_name='bindtype', default=u'permission', multivalue=False, required=False, values=(u'permission',)) -option: DNOrURL('ipapermlocation', attribute=True, autofill=False, cli_name='subtree', default=ipapython.dn.DN('dc=idm,dc=lab,dc=eng,dc=brq,dc=redhat,dc=com'), multivalue=False, required=False) +option: DNOrURL('ipapermlocation', attribute=True, autofill=False, cli_name='subtree', multivalue=False, required=False) option: StrEnum('ipapermright', attribute=True, autofill=False, cli_name='permissions', multivalue=True, required=False, values=(u'read', u'search', u'compare', u'write', u'add', u'delete', u'all')) option: DNParam('ipapermtarget', attribute=True, autofill=False, cli_name='target', multivalue=False, required=False) option: Str('ipapermtargetfilter', attribute=True, autofill=False, cli_name='filter', multivalue=False, required=False) diff --git a/ipalib/plugins/permission.py b/ipalib/plugins/permission.py index bdde3e32..345faa89 100644 --- a/ipalib/plugins/permission.py +++ b/ipalib/plugins/permission.py @@ -188,7 +188,6 @@ class permission(baseldap.LDAPObject): cli_name='subtree', label=_('Subtree'), doc=_('Subtree to apply permissions to'), - default=api.env.basedn, flags={'ask_create'}, ), Str( -- cgit