From a787c8d8ef47b15f67401c5128d15c73cf02e78d Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pviktori@redhat.com>
Date: Mar 12 2012 16:17:07 +0000
Subject: Mark most config options as required


IPA assumes most config options are present, but allowed the user
to delete them. This patch marks them as required.

https://fedorahosted.org/freeipa/ticket/2159

---

diff --git a/ipalib/plugins/config.py b/ipalib/plugins/config.py
index c4615e3..df960f4 100644
--- a/ipalib/plugins/config.py
+++ b/ipalib/plugins/config.py
@@ -97,22 +97,22 @@ class config(LDAPObject):
     label_singular = _('Configuration')
 
     takes_params = (
-        Int('ipamaxusernamelength?',
+        Int('ipamaxusernamelength',
             cli_name='maxusername',
             label=_('Maximum username length'),
             minvalue=1,
         ),
-        IA5Str('ipahomesrootdir?',
+        IA5Str('ipahomesrootdir',
             cli_name='homedirectory',
             label=_('Home directory base'),
             doc=_('Default location of home directories'),
         ),
-        Str('ipadefaultloginshell?',
+        Str('ipadefaultloginshell',
             cli_name='defaultshell',
             label=_('Default shell'),
             doc=_('Default shell for new users'),
         ),
-        Str('ipadefaultprimarygroup?',
+        Str('ipadefaultprimarygroup',
             cli_name='defaultgroup',
             label=_('Default users group'),
             doc=_('Default group for new users'),
@@ -122,52 +122,52 @@ class config(LDAPObject):
             label=_('Default e-mail domain'),
             doc=_('Default e-mail domain'),
         ),
-        Int('ipasearchtimelimit?', validate_searchtimelimit,
+        Int('ipasearchtimelimit', validate_searchtimelimit,
             cli_name='searchtimelimit',
             label=_('Search time limit'),
             doc=_('Maximum amount of time (seconds) for a search (> 0, or -1 for unlimited)'),
             minvalue=-1,
         ),
-        Int('ipasearchrecordslimit?',
+        Int('ipasearchrecordslimit',
             cli_name='searchrecordslimit',
             label=_('Search size limit'),
             doc=_('Maximum number of records to search (-1 is unlimited)'),
             minvalue=-1,
         ),
-        IA5Str('ipausersearchfields?',
+        IA5Str('ipausersearchfields',
             cli_name='usersearch',
             label=_('User search fields'),
             doc=_('A comma-separated list of fields to search in when searching for users'),
         ),
-        IA5Str('ipagroupsearchfields?',
+        IA5Str('ipagroupsearchfields',
             cli_name='groupsearch',
             label='Group search fields',
             doc=_('A comma-separated list of fields to search in when searching for groups'),
         ),
-        Bool('ipamigrationenabled?',
+        Bool('ipamigrationenabled',
             cli_name='enable_migration',
             label=_('Enable migration mode'),
             doc=_('Enable migration mode'),
         ),
-        Str('ipacertificatesubjectbase?',
+        Str('ipacertificatesubjectbase',
             cli_name='subject',
             label=_('Certificate Subject base'),
             doc=_('Base for certificate subjects (OU=Test,O=Example)'),
             flags=['no_update'],
         ),
-        Str('ipagroupobjectclasses*',
+        Str('ipagroupobjectclasses+',
             cli_name='groupobjectclasses',
             label=_('Default group objectclasses'),
             doc=_('Default group objectclasses (comma-separated list)'),
             csv=True,
         ),
-        Str('ipauserobjectclasses*',
+        Str('ipauserobjectclasses+',
             cli_name='userobjectclasses',
             label=_('Default user objectclasses'),
             doc=_('Default user objectclasses (comma-separated list)'),
             csv=True,
         ),
-        Int('ipapwdexpadvnotify?',
+        Int('ipapwdexpadvnotify',
             cli_name='pwdexpnotify',
             label=_('Password Expiration Notification (days)'),
             doc=_('Number of days\'s notice of impending password expiration'),
@@ -180,11 +180,11 @@ class config(LDAPObject):
             values=(u'AllowLMhash', u'AllowNThash'),
             csv=True,
         ),
-        Str('ipaselinuxusermaporder?',
+        Str('ipaselinuxusermaporder',
             label=_('SELinux user map order'),
             doc=_('Order in increasing priority of SELinux users, delimited by $'),
         ),
-        Str('ipaselinuxusermapdefault?',
+        Str('ipaselinuxusermapdefault',
             label=_('Default SELinux user'),
             doc=_('Default SELinux user when no match is found in SELinux map rule'),
         ),