1 files changed, 24 insertions, 23 deletions
diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py
index 9752ab758..4565ec9a3 100644
--- a/src/lib/Bcfg2/Options.py
+++ b/src/lib/Bcfg2/Options.py
@@ -2,15 +2,17 @@
 
 import copy
 import getopt
+import grp
 import inspect
 import os
+import pwd
 import re
 import shlex
 import sys
-import grp
-import pwd
+
 import Bcfg2.Client.Tools
 from Bcfg2.Compat import ConfigParser
+from Bcfg2.Compat import literal_eval
 from Bcfg2.version import __version__
 
 
@@ -329,25 +331,9 @@ def colon_split(c_string):
 
 
 def dict_split(c_string):
-    """ split an option string on commas, optionally surrounded by
-    whitespace and split the resulting items again on equals signs,
-    returning a dict """
-    result = dict()
-    if c_string:
-        items = re.split(r'\s*,\s*', c_string)
-        for item in items:
-            if r'=' in item:
-                key, value = item.split(r'=', 1)
-                try:
-                    result[key] = get_bool(value)
-                except ValueError:
-                    try:
-                        result[key] = get_int(value)
-                    except ValueError:
-                        result[key] = value
-            else:
-                result[item] = True
-    return result
+    """ literally evaluate the option in order to allow for arbitrarily nested
+    dictionaries """
+    return literal_eval(c_string)
 
 
 def get_bool(val):
@@ -1129,6 +1115,18 @@ CLIENT_POSIX_GID_BLACKLIST = \
            default=[],
            cf=('POSIXUsers', 'gid_blacklist'),
            cook=list_split)
+CLIENT_POSIX_SECONTEXT_IGNORE = \
+    Option("secontext types to ignore labeling errors",
+           default=['anon_inodefs_t', 'bdev_t', 'binfmt_misc_fs_t',
+                    'capifs_t', 'configfs_t', 'cpusetfs_t', 'ecryptfs_t',
+                    'eventpollfs_t', 'futexfs_t', 'hugetlbfs_t', 'ibmasmfs_t',
+                    'inotifyfs_t', 'mvfs_t', 'nfsd_fs_t', 'oprofilefs_t',
+                    'ramfs_t', 'romfs_t', 'rpc_pipefs_t', 'spufs_t',
+                    'squash_t', 'vmblock_t', 'vxfs_t', 'xenfs_t', 'autofs_t',
+                    'cifs_t', 'dosfs_t', 'fusefs_t', 'iso9660_t',
+                    'removable_t', 'nfs_t'],
+           cf=('POSIX', 'secontext_ignore'),
+           cook=list_split)
 
 # Logging options
 LOGGING_FILE_PATH = \
@@ -1295,7 +1293,8 @@ DRIVER_OPTIONS = \
          posix_uid_whitelist=CLIENT_POSIX_UID_WHITELIST,
          posix_gid_whitelist=CLIENT_POSIX_GID_WHITELIST,
          posix_uid_blacklist=CLIENT_POSIX_UID_BLACKLIST,
-         posix_gid_blacklist=CLIENT_POSIX_GID_BLACKLIST)
+         posix_gid_blacklist=CLIENT_POSIX_GID_BLACKLIST,
+         posix_secontext_ignore=CLIENT_POSIX_SECONTEXT_IGNORE)
 
 CLIENT_COMMON_OPTIONS = \
     dict(extra=CLIENT_EXTRA_DISPLAY,
@@ -1362,7 +1361,9 @@ TEST_COMMON_OPTIONS = dict(noseopts=TEST_NOSEOPTS,
                            validate=CFG_VALIDATION)
 
 INFO_COMMON_OPTIONS = dict(ppath=PARANOID_PATH,
-                           max_copies=PARANOID_MAX_COPIES)
+                           max_copies=PARANOID_MAX_COPIES,
+                           daemon_uid=SERVER_DAEMON_USER,
+                           daemon_gid=SERVER_DAEMON_GROUP)
 INFO_COMMON_OPTIONS.update(CLI_COMMON_OPTIONS)
 INFO_COMMON_OPTIONS.update(SERVER_COMMON_OPTIONS)