From: Ondrej Kozina <okozina@redhat.com>
Date: Fri, 17 Jun 2016 09:33:07 +0000 (+0200)
Subject: make _is_selinux_enabled() return bool explicitly
X-Git-Tag: v0.3.3~3^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d1240c29c2d10151dc5687034ee4f5b9840ca10;p=thirdparty%2Fsnapper.git

make _is_selinux_enabled() return bool explicitly
---

diff --git a/snapper/Selinux.cc b/snapper/Selinux.cc
index ed059b85..36a8b237 100644
--- a/snapper/Selinux.cc
+++ b/snapper/Selinux.cc
@@ -125,15 +125,15 @@ namespace snapper
     }
 
 
-    int
+    bool
     _is_selinux_enabled()
     {
-	static int selinux_checked = 0, selinux_enabled = 0;
+	static bool selinux_enabled, selinux_checked = false;
 
 	if (!selinux_checked)
 	{
-	    selinux_enabled = is_selinux_enabled();
-	    selinux_checked = 1;
+	    selinux_enabled = (is_selinux_enabled() == 1); // may return -1 on error
+	    selinux_checked = true;
 	    y2mil("Selinux support " << (selinux_enabled ? "en" : "dis") << "abled");
 	}
 
diff --git a/snapper/Selinux.h b/snapper/Selinux.h
index 8698cd58..e4e3549f 100644
--- a/snapper/Selinux.h
+++ b/snapper/Selinux.h
@@ -45,7 +45,7 @@ namespace snapper {
 
     const static string selinux_snapperd_data = "snapperd_data";
 
-    int _is_selinux_enabled();
+    bool _is_selinux_enabled();
 
     class SnapperContexts
     {