summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2011-06-29 15:09:29 -0400
committerRob Crittenden <rcritten@redhat.com>2011-07-14 19:18:02 -0400
commit9dfdf55034223e05c72e59239169be8cf315fc29 (patch)
tree856ada838a5cb48104326e725e5e35175cf2c3b6
parentef29207047cb0d4af422d54cdb805f13d241db2e (diff)
downloadfreeipa-9dfdf55034223e05c72e59239169be8cf315fc29.tar.gz
freeipa-9dfdf55034223e05c72e59239169be8cf315fc29.tar.xz
freeipa-9dfdf55034223e05c72e59239169be8cf315fc29.zip
In sudo labels we should use RunAs and not Run As.
https://fedorahosted.org/freeipa/ticket/1328
-rw-r--r--API.txt12
-rw-r--r--ipalib/plugins/sudorule.py12
2 files changed, 12 insertions, 12 deletions
diff --git a/API.txt b/API.txt
index 44292a988..70bb7782f 100644
--- a/API.txt
+++ b/API.txt
@@ -2364,8 +2364,8 @@ option: Str('description', attribute=True, cli_name='desc', label=Gettext('Descr
option: StrEnum('usercategory', attribute=True, cli_name='usercat', label=Gettext('User category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
option: StrEnum('hostcategory', attribute=True, cli_name='hostcat', label=Gettext('Host category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
option: StrEnum('cmdcategory', attribute=True, cli_name='cmdcat', label=Gettext('Command category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: StrEnum('ipasudorunasusercategory', attribute=True, cli_name='runasusercat', label=Gettext('Run As User category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: StrEnum('ipasudorunasgroupcategory', attribute=True, cli_name='runasgroupcat', label=Gettext('Run As Group category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
+option: StrEnum('ipasudorunasusercategory', attribute=True, cli_name='runasusercat', label=Gettext('RunAs User category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
+option: StrEnum('ipasudorunasgroupcategory', attribute=True, cli_name='runasgroupcat', label=Gettext('RunAs Group category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
option: Str('externaluser', attribute=True, cli_name='externaluser', label=Gettext('External User', domain='ipa', localedir=None), multivalue=False, required=False)
option: Str('ipasudorunasextuser', attribute=True, cli_name='runasexternaluser', label=Gettext('RunAs External User', domain='ipa', localedir=None), multivalue=False, required=False)
option: Str('ipasudorunasextgroup', attribute=True, cli_name='runasexternalgroup', label=Gettext('RunAs External Group', domain='ipa', localedir=None), multivalue=False, required=False)
@@ -2470,8 +2470,8 @@ option: Str('description', attribute=True, autofill=False, cli_name='desc', labe
option: StrEnum('usercategory', attribute=True, autofill=False, cli_name='usercat', label=Gettext('User category', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'all',))
option: StrEnum('hostcategory', attribute=True, autofill=False, cli_name='hostcat', label=Gettext('Host category', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'all',))
option: StrEnum('cmdcategory', attribute=True, autofill=False, cli_name='cmdcat', label=Gettext('Command category', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'all',))
-option: StrEnum('ipasudorunasusercategory', attribute=True, autofill=False, cli_name='runasusercat', label=Gettext('Run As User category', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'all',))
-option: StrEnum('ipasudorunasgroupcategory', attribute=True, autofill=False, cli_name='runasgroupcat', label=Gettext('Run As Group category', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'all',))
+option: StrEnum('ipasudorunasusercategory', attribute=True, autofill=False, cli_name='runasusercat', label=Gettext('RunAs User category', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'all',))
+option: StrEnum('ipasudorunasgroupcategory', attribute=True, autofill=False, cli_name='runasgroupcat', label=Gettext('RunAs Group category', domain='ipa', localedir=None), multivalue=False, query=True, required=False, values=(u'all',))
option: Str('externaluser', attribute=True, autofill=False, cli_name='externaluser', label=Gettext('External User', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
option: Str('ipasudorunasextuser', attribute=True, autofill=False, cli_name='runasexternaluser', label=Gettext('RunAs External User', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
option: Str('ipasudorunasextgroup', attribute=True, autofill=False, cli_name='runasexternalgroup', label=Gettext('RunAs External Group', domain='ipa', localedir=None), multivalue=False, query=True, required=False)
@@ -2491,8 +2491,8 @@ option: Str('description', attribute=True, autofill=False, cli_name='desc', labe
option: StrEnum('usercategory', attribute=True, autofill=False, cli_name='usercat', label=Gettext('User category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
option: StrEnum('hostcategory', attribute=True, autofill=False, cli_name='hostcat', label=Gettext('Host category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
option: StrEnum('cmdcategory', attribute=True, autofill=False, cli_name='cmdcat', label=Gettext('Command category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: StrEnum('ipasudorunasusercategory', attribute=True, autofill=False, cli_name='runasusercat', label=Gettext('Run As User category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
-option: StrEnum('ipasudorunasgroupcategory', attribute=True, autofill=False, cli_name='runasgroupcat', label=Gettext('Run As Group category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
+option: StrEnum('ipasudorunasusercategory', attribute=True, autofill=False, cli_name='runasusercat', label=Gettext('RunAs User category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
+option: StrEnum('ipasudorunasgroupcategory', attribute=True, autofill=False, cli_name='runasgroupcat', label=Gettext('RunAs Group category', domain='ipa', localedir=None), multivalue=False, required=False, values=(u'all',))
option: Str('externaluser', attribute=True, autofill=False, cli_name='externaluser', label=Gettext('External User', domain='ipa', localedir=None), multivalue=False, required=False)
option: Str('ipasudorunasextuser', attribute=True, autofill=False, cli_name='runasexternaluser', label=Gettext('RunAs External User', domain='ipa', localedir=None), multivalue=False, required=False)
option: Str('ipasudorunasextgroup', attribute=True, autofill=False, cli_name='runasexternalgroup', label=Gettext('RunAs External Group', domain='ipa', localedir=None), multivalue=False, required=False)
diff --git a/ipalib/plugins/sudorule.py b/ipalib/plugins/sudorule.py
index a1d05a815..55d2904f5 100644
--- a/ipalib/plugins/sudorule.py
+++ b/ipalib/plugins/sudorule.py
@@ -102,14 +102,14 @@ class sudorule(LDAPObject):
),
StrEnum('ipasudorunasusercategory?',
cli_name='runasusercat',
- label=_('Run As User category'),
- doc=_('Run As User category the rule applies to'),
+ label=_('RunAs User category'),
+ doc=_('RunAs User category the rule applies to'),
values=(u'all', ),
),
StrEnum('ipasudorunasgroupcategory?',
cli_name='runasgroupcat',
- label=_('Run As Group category'),
- doc=_('Run As Group category the rule applies to'),
+ label=_('RunAs Group category'),
+ doc=_('RunAs Group category the rule applies to'),
values=(u'all', ),
),
Str('memberuser_user?',
@@ -145,11 +145,11 @@ class sudorule(LDAPObject):
flags=['no_create', 'no_update', 'no_search'],
),
Str('ipasudorunas_user?',
- label=_('Run As User'),
+ label=_('RunAs User'),
flags=['no_create', 'no_update', 'no_search'],
),
Str('ipasudorunas_group?',
- label=_('Run As Group'),
+ label=_('RunAs Group'),
flags=['no_create', 'no_update', 'no_search'],
),
Str('externaluser?',