Allow 'nfs:NONE' in global configuration

This patch adds 'nfs:NONE' as an allowed entry for the global
authorization data type in the CLI and WebUI. This is an ad-hoc solution
to make sure that the new default value for the NFS service is not
removed by chance.

This patch should be removed if a more generic solution is implemented
to modify service:TYPE style values of the authorization data type.

https://fedorahosted.org/freeipa/ticket/2960
This commit is contained in:
Sumit Bose
2013-03-04 14:52:10 +01:00
committed by Martin Kosek
parent 5f3142c1e9
commit 331856b13c
3 changed files with 4 additions and 4 deletions

View File

@@ -498,7 +498,7 @@ option: Str('ipadefaultprimarygroup', attribute=True, autofill=False, cli_name='
option: Str('ipagroupobjectclasses', attribute=True, autofill=False, cli_name='groupobjectclasses', csv=True, multivalue=True, required=False)
option: IA5Str('ipagroupsearchfields', attribute=True, autofill=False, cli_name='groupsearch', multivalue=False, required=False)
option: IA5Str('ipahomesrootdir', attribute=True, autofill=False, cli_name='homedirectory', multivalue=False, required=False)
option: StrEnum('ipakrbauthzdata', attribute=True, autofill=False, cli_name='pac_type', csv=True, multivalue=True, required=False, values=(u'MS-PAC', u'PAD'))
option: StrEnum('ipakrbauthzdata', attribute=True, autofill=False, cli_name='pac_type', csv=True, multivalue=True, required=False, values=(u'MS-PAC', u'PAD', u'nfs:NONE'))
option: Int('ipamaxusernamelength', attribute=True, autofill=False, cli_name='maxusername', minvalue=1, multivalue=False, required=False)
option: Bool('ipamigrationenabled', attribute=True, autofill=False, cli_name='enable_migration', multivalue=False, required=False)
option: Int('ipapwdexpadvnotify', attribute=True, autofill=False, cli_name='pwdexpnotify', minvalue=0, multivalue=False, required=False)

View File

@@ -102,7 +102,7 @@ IPA.serverconfig.entity = function(spec) {
{
name: 'ipakrbauthzdata',
type: 'checkboxes',
options: IPA.create_options(['MS-PAC', 'PAD'])
options: IPA.create_options(['MS-PAC', 'PAD', 'nfs:NONE'])
}
]
}
@@ -117,4 +117,4 @@ IPA.serverconfig.entity = function(spec) {
IPA.register('config', IPA.serverconfig.entity);
return {};
});
});

View File

@@ -194,7 +194,7 @@ class config(LDAPObject):
cli_name='pac_type',
label=_('Default PAC types'),
doc=_('Default types of PAC supported for services'),
values=(u'MS-PAC', u'PAD'),
values=(u'MS-PAC', u'PAD', u'nfs:NONE'),
csv=True,
),
)