[Pkg-shadow-commits] r2041 - in upstream/trunk: . libmisc

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-05-25 23:45:21 +0000 (Sun, 25 May 2008)
New Revision: 2041

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/libmisc/copydir.c
Log:
selinux_checked, selinux_enabled, and set_orig are now booleans.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-05-25 23:42:39 UTC (rev 2040)
+++ upstream/trunk/ChangeLog	2008-05-25 23:45:21 UTC (rev 2041)
@@ -1,5 +1,10 @@
 2008-05-26  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* libmisc/copydir.c: selinux_checked, selinux_enabled, and set_orig
+	are now booleans.
+
+2008-05-26  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* libmisc/setugid.c (setup_uid_gid): The is_console argument is now
 	a bool.
 	* libmisc/setugid.c: Avoid implicit conversion of integers /

Modified: upstream/trunk/libmisc/copydir.c
===================================================================
--- upstream/trunk/libmisc/copydir.c	2008-05-25 23:42:39 UTC (rev 2040)
+++ upstream/trunk/libmisc/copydir.c	2008-05-25 23:45:21 UTC (rev 2041)
@@ -43,7 +43,6 @@
 #include "defines.h"
 #ifdef WITH_SELINUX
 #include <selinux/selinux.h>
-static int selinux_enabled = -1;
 #endif
 static const char *src_orig;
 static const char *dst_orig;
@@ -87,11 +86,15 @@
  */
 static int selinux_file_context (const char *dst_name)
 {
+	static bool selinux_checked = false;
+	static bool selinux_enabled;
 	security_context_t scontext = NULL;
 
-	if (selinux_enabled < 0) {
+	if (!selinux_checked) {
 		selinux_enabled = is_selinux_enabled () > 0;
+		selinux_checked = true;
 	}
+
 	if (selinux_enabled) {
 		/* Get the default security context for this file */
 		if (matchpathcon (dst_name, 0, &scontext) < 0) {
@@ -189,7 +192,7 @@
 	char src_name[1024];
 	char dst_name[1024];
 	int err = 0;
-	int set_orig = 0;
+	bool set_orig = false;
 	struct DIRECT *ent;
 	DIR *dir;
 
@@ -216,10 +219,10 @@
 		return -1;
 	}
 
-	if (src_orig == 0) {
+	if (src_orig == NULL) {
 		src_orig = src_root;
 		dst_orig = dst_root;
-		set_orig++;
+		set_orig = true;
 	}
 	while ((0 == err) && (ent = readdir (dir)) != NULL) {
 		/*
@@ -253,8 +256,8 @@
 	(void) closedir (dir);
 
 	if (set_orig) {
-		src_orig = 0;
-		dst_orig = 0;
+		src_orig = NULL;
+		dst_orig = NULL;
 	}
 	return err;
 }