diff options
author | Rob Crittenden <rcritten@redhat.com> | 2012-01-19 17:42:26 -0500 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2012-02-09 08:29:09 +0100 |
commit | 44c69ef33ef63030007e55b0f0dddcac12372543 (patch) | |
tree | 804baa85e21726984a3d5f5b88759870cdf0a6bc /ipalib | |
parent | 616d543a54833a1fde6b0098d91ac0f4e14f7a57 (diff) | |
download | freeipa-44c69ef33ef63030007e55b0f0dddcac12372543.tar.gz freeipa-44c69ef33ef63030007e55b0f0dddcac12372543.tar.xz freeipa-44c69ef33ef63030007e55b0f0dddcac12372543.zip |
Make ipaconfigstring modifiable by users.
Convert from a freeform string into a enumeration.
Only values currently allowed are AllowLMhash and AllowNThash.
To add more than one value on the command-line either specify
--ipaconfigstring multiple times or add the values comma-separated.
https://fedorahosted.org/freeipa/ticket/1433
Diffstat (limited to 'ipalib')
-rw-r--r-- | ipalib/plugins/config.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ipalib/plugins/config.py b/ipalib/plugins/config.py index 0c238ac98..1455771d1 100644 --- a/ipalib/plugins/config.py +++ b/ipalib/plugins/config.py @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. from ipalib import api -from ipalib import Bool, Int, Str, IA5Str +from ipalib import Bool, Int, Str, IA5Str, StrEnum from ipalib.plugins.baseldap import * from ipalib import _ from ipalib.errors import ValidationError @@ -89,7 +89,8 @@ class config(LDAPObject): 'ipadefaultprimarygroup', 'ipadefaultemaildomain', 'ipasearchtimelimit', 'ipasearchrecordslimit', 'ipausersearchfields', 'ipagroupsearchfields', 'ipamigrationenabled', 'ipacertificatesubjectbase', - 'ipapwdexpadvnotify', 'ipaselinuxusermaporder', 'ipaselinuxusermapdefault', + 'ipapwdexpadvnotify', 'ipaselinuxusermaporder', + 'ipaselinuxusermapdefault', 'ipaconfigstring', ] label = _('Configuration') @@ -172,11 +173,12 @@ class config(LDAPObject): doc=_('Number of days\'s notice of impending password expiration'), minvalue=0, ), - Str('ipaconfigstring?', + StrEnum('ipaconfigstring*', cli_name='ipaconfigstring', label=_('Password plugin features'), doc=_('Extra hashes to generate in password plug-in'), - flags=['no_update'], + values=(u'AllowLMhash', u'AllowNThash'), + csv=True, ), Str('ipaselinuxusermaporder?', label=_('SELinux user map order'), |