diff options
author | Rob Crittenden <rcritten@redhat.com> | 2010-12-06 15:09:03 -0500 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2010-12-07 16:37:42 -0500 |
commit | 6e2dd0fa5b79849c3dbd5f9b855e43b634e2a4b3 (patch) | |
tree | 3264b8ba10fdb44845ee4f257e851f2764f3a6cd /ipalib/plugins | |
parent | 78786a699586b12ec53c0a87703e0a44e9c7427e (diff) | |
download | freeipa-6e2dd0fa5b79849c3dbd5f9b855e43b634e2a4b3.tar.gz freeipa-6e2dd0fa5b79849c3dbd5f9b855e43b634e2a4b3.tar.xz freeipa-6e2dd0fa5b79849c3dbd5f9b855e43b634e2a4b3.zip |
Add new parameter type IA5Str and use this to enforce the right charset.
ticket 496
Diffstat (limited to 'ipalib/plugins')
-rw-r--r-- | ipalib/plugins/automount.py | 28 | ||||
-rw-r--r-- | ipalib/plugins/config.py | 8 |
2 files changed, 18 insertions, 18 deletions
diff --git a/ipalib/plugins/automount.py b/ipalib/plugins/automount.py index df9b34111..958b4c238 100644 --- a/ipalib/plugins/automount.py +++ b/ipalib/plugins/automount.py @@ -168,7 +168,7 @@ automountInformation: -ro,soft,rsize=8192,wsize=8192 nfs.example.com:/vol/arch """ from ipalib import api, errors from ipalib import Object, Command -from ipalib import Flag, Str +from ipalib import Flag, Str, IA5Str from ipalib.plugins.baseldap import * from ipalib import _, ngettext import os @@ -486,11 +486,11 @@ class automountmap(LDAPObject): default_attributes = ['automountmapname', 'description'] takes_params = ( - Str('automountmapname', - cli_name='map', - label=_('Map'), - doc=_('Automount map name'), - primary_key=True, + IA5Str('automountmapname', + cli_name='map', + label=_('Map'), + doc=_('Automount map name'), + primary_key=True, ), Str('description?', cli_name='desc', @@ -568,15 +568,15 @@ class automountkey(LDAPObject): ] takes_params = ( - Str('automountkey', - cli_name='key', - label=_('Key'), - doc=_('Automount key name'), - primary_key=True, + IA5Str('automountkey', + cli_name='key', + label=_('Key'), + doc=_('Automount key name'), + primary_key=True, ), - Str('automountinformation', - cli_name='info', - label=_('Mount information'), + IA5Str('automountinformation', + cli_name='info', + label=_('Mount information'), ), Str('description?', cli_name='desc', diff --git a/ipalib/plugins/config.py b/ipalib/plugins/config.py index 79db77e98..0fa142b9a 100644 --- a/ipalib/plugins/config.py +++ b/ipalib/plugins/config.py @@ -54,7 +54,7 @@ Server Configuration. """ from ipalib import api -from ipalib import Bool, Int, Str +from ipalib import Bool, Int, Str, IA5Str from ipalib.plugins.baseldap import * from ipalib import _ @@ -79,7 +79,7 @@ class config(LDAPObject): label=_('Max username length'), minvalue=1, ), - Str('ipahomesrootdir?', + IA5Str('ipahomesrootdir?', cli_name='homedirectory', label=_('Home directory base'), doc=_('Default location of home directories'), @@ -111,12 +111,12 @@ class config(LDAPObject): doc=_('Max. number of records to search (-1 is unlimited)'), minvalue=-1, ), - Str('ipausersearchfields?', + IA5Str('ipausersearchfields?', cli_name='usersearch', label=_('User search fields'), doc=_('A comma-separated list of fields to search when searching for users'), ), - Str('ipagroupsearchfields?', + IA5Str('ipagroupsearchfields?', cli_name='groupsearch', label='Group search fields', doc=_('A comma-separated list of fields to search when searching for groups'), |