From 7fe095c98c5a25f0d866d50e47ea5d0f57a24203 Mon Sep 17 00:00:00 2001
From: Petr Voborník <pvoborni@redhat.com>
Date: Feb 20 2012 21:48:14 +0000
Subject: Added missing configuration options


Missing options were added to Web UI's IPA Server/Configuration page.
 * ipaconfigstring
 * ipaselinuxusermaporder
 * ipaselinuxusermapdefault

https://fedorahosted.org/freeipa/ticket/2285
https://fedorahosted.org/freeipa/ticket/2400

---

diff --git a/install/ui/serverconfig.js b/install/ui/serverconfig.js
index e6da795..2b9be6e 100644
--- a/install/ui/serverconfig.js
+++ b/install/ui/serverconfig.js
@@ -60,6 +60,11 @@ IPA.config.entity = function(spec) {
                         'ipamaxusernamelength',
                         'ipapwdexpadvnotify',
                         {
+                            name: 'ipaconfigstring',
+                            type: 'checkboxes',
+                            options: IPA.create_options(['AllowLMhash','AllowNThash'])
+                        },
+                        {
                             type: 'checkbox',
                             name: 'ipamigrationenabled'
                         },
@@ -79,6 +84,14 @@ IPA.config.entity = function(spec) {
                             name: 'ipagroupobjectclasses'
                         }
                     ]
+                },
+                {
+                    name: 'selinux',
+                    label: IPA.messages.objects.config.selinux,
+                    fields: [
+                        'ipaselinuxusermaporder',
+                        'ipaselinuxusermapdefault'
+                    ]
                 }
             ],
             needs_update: true
diff --git a/install/ui/test/data/config_show.json b/install/ui/test/data/config_show.json
index 1b6d594..be3edc2 100644
--- a/install/ui/test/data/config_show.json
+++ b/install/ui/test/data/config_show.json
@@ -20,6 +20,8 @@
                 "ipapwdexpadvnotify": "rscwo",
                 "ipasearchrecordslimit": "rscwo",
                 "ipasearchtimelimit": "rscwo",
+                "ipaselinuxusermapdefault": "rscwo",
+                "ipaselinuxusermaporder": "rscwo",
                 "ipauserobjectclasses": "rscwo",
                 "ipausersearchfields": "rscwo",
                 "nsaccountlock": "rscwo",
@@ -72,6 +74,12 @@
             "ipasearchtimelimit": [
                 "2"
             ],
+            "ipaselinuxusermapdefault": [
+                "guest_u:s0"
+            ],
+            "ipaselinuxusermaporder": [
+                "guest_u:s0$xguest_u:s0$user_u:s0-s0:c0.c1023$staff_u:s0-s0:c0.c1023$unconfined_u:s0-s0:c0.c1023"
+            ],
             "ipauserobjectclasses": [
                 "top",
                 "person",
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index 740307f..267ab5c 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -179,6 +179,7 @@
                         "config": {
                             "group": "Group Options",
                             "search": "Search Options",
+                            "selinux": "SELinux Options",
                             "user": "User Options"
                         },
                         "delegation": {},
diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py
index 8623e61..f3f813b 100644
--- a/ipalib/plugins/internal.py
+++ b/ipalib/plugins/internal.py
@@ -315,6 +315,7 @@ class i18n_messages(Command):
             "config": {
                 "group": _("Group Options"),
                 "search": _("Search Options"),
+                "selinux": _("SELinux Options"),
                 "user": _("User Options"),
             },
             "delegation": {