1 files changed, 22 insertions, 9 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/SELinux.py b/src/lib/Bcfg2/Client/Tools/SELinux.py
index 0041ce61a..0b4aba60d 100644
--- a/src/lib/Bcfg2/Client/Tools/SELinux.py
+++ b/src/lib/Bcfg2/Client/Tools/SELinux.py
@@ -204,7 +204,16 @@ class SELinuxEntryHandler(object):
         type, if the records object supports the customized() method
         """
         if hasattr(self.records, "customized") and self.custom_re:
-            return dict([(k, self.all_records[k]) for k in self.custom_keys])
+            rv = dict()
+            for key in self.custom_keys:
+                if key in self.all_records:
+                    rv[key] = self.all_records[key]
+                else:
+                    self.logger.warning("SELinux %s %s customized, but no "
+                                        "record found. This may indicate an "
+                                        "error in your SELinux policy." %
+                                        (self.etype, key))
+            return rv
         else:
             # ValueError is really a pretty dumb exception to raise,
             # but that's what the seobject customized() method raises
@@ -491,7 +500,8 @@ class SELinuxSeportHandler(SELinuxEntryHandler):
     def _defaultargs(self, entry):
         """ argument list for adding and modifying entries """
         (port, proto) = entry.get("name").split("/")
-        return (port, proto, '', entry.get("selinuxtype"))
+        return (port, proto, entry.get("mlsrange", ""),
+                entry.get("selinuxtype"))
 
     def _deleteargs(self, entry):
         return tuple(entry.get("name").split("/"))
@@ -564,7 +574,7 @@ class SELinuxSefcontextHandler(SELinuxEntryHandler):
         """ argument list for adding, modifying, and deleting entries """
         return (entry.get("name"), entry.get("selinuxtype"),
                 self.filetypeargs[entry.get("filetype", "all")],
-                '', '')
+                entry.get("mlsrange", ""), '')
 
     def primarykey(self, entry):
         return ":".join([entry.tag, entry.get("name"),
@@ -599,7 +609,7 @@ class SELinuxSenodeHandler(SELinuxEntryHandler):
     def _defaultargs(self, entry):
         """ argument list for adding, modifying, and deleting entries """
         (addr, netmask) = entry.get("name").split("/")
-        return (addr, netmask, entry.get("proto"), "",
+        return (addr, netmask, entry.get("proto"), entry.get("mlsrange", ""),
                 entry.get("selinuxtype"))
 
 
@@ -611,7 +621,8 @@ class SELinuxSeloginHandler(SELinuxEntryHandler):
 
     def _defaultargs(self, entry):
         """ argument list for adding, modifying, and deleting entries """
-        return (entry.get("name"), entry.get("selinuxuser"), "")
+        return (entry.get("name"), entry.get("selinuxuser"),
+                entry.get("mlsrange", ""))
 
 
 class SELinuxSeuserHandler(SELinuxEntryHandler):
@@ -651,15 +662,16 @@ class SELinuxSeuserHandler(SELinuxEntryHandler):
         # prefix.  see the comment in Install() above for more
         # details.
         rv = [entry.get("name"),
-              entry.get("roles", "").replace(" ", ",").split(",")]
+              entry.get("roles", "").replace(" ", ",").split(","),
+              '', entry.get("mlsrange", "")]
         if self.needs_prefix:
-            rv.extend(['', '', entry.get("prefix")])
+            rv.append(entry.get("prefix"))
         else:
             key = self._key(entry)
             if key in self.all_records:
                 attrs = self._key2attrs(key)
                 if attrs['prefix'] != entry.get("prefix"):
-                    rv.extend(['', '', entry.get("prefix")])
+                    rv.append(entry.get("prefix"))
         return tuple(rv)
 
 
@@ -671,7 +683,8 @@ class SELinuxSeinterfaceHandler(SELinuxEntryHandler):
 
     def _defaultargs(self, entry):
         """ argument list for adding, modifying, and deleting entries """
-        return (entry.get("name"), '', entry.get("selinuxtype"))
+        return (entry.get("name"), entry.get("mlsrange", ""),
+                entry.get("selinuxtype"))
 
 
 class SELinuxSepermissiveHandler(SELinuxEntryHandler):