Use pykickstart SELinux constants for consistency (#172356).

2 files changed, 12 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index dde7aaf54..2ee56959c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-03  Chris Lumens  <clumens@redhat.com>
+
+	* security.py:  Use pykickstart SELinux constants for consistency
+	(#172356).
+
 2005-11-02  Peter Jones <pjones@redhat.com>
 
 	* loader2/module-info: add bnx2
diff --git a/security.py b/security.py
index 9322be4ea..64a419c6b 100644
--- a/security.py
+++ b/security.py
@@ -16,29 +16,26 @@
 import os, string
 import iutil
 from flags import flags
+from pykickstart.constants import *
 
 import logging
 log = logging.getLogger("anaconda")
 
-SEL_DISABLED = 0
-SEL_PERMISSIVE = 1
-SEL_ENFORCING = 2
-
-selinux_states = { SEL_DISABLED: "disabled",
-                   SEL_ENFORCING: "enforcing",
-                   SEL_PERMISSIVE: "permissive" }
+selinux_states = { SELINUX_DISABLED: "disabled",
+                   SELINUX_ENFORCING: "enforcing",
+                   SELINUX_PERMISSIVE: "permissive" }
 
 class Security:
     def __init__(self):
         if flags.selinux == 1:
-            self.selinux = SEL_ENFORCING
+            self.selinux = SELINUX_ENFORCING
         else:
-            self.selinux = SEL_DISABLED
+            self.selinux = SELINUX_DISABLED
 
     def setSELinux(self, val):
         if not selinux_states.has_key(val):
             log.error("Tried to set to invalid SELinux state: %s" %(val,))
-            val = SEL_DISABLED
+            val = SELINUX_DISABLED
 
         self.selinux = val