From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Sat, 5 Jan 2008 14:01:34 +0000 (+0000)
Subject: stat shadows another stat variable. Remove this
X-Git-Tag: 4.1.1~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d440a2a526db64a1490f88ba835bb41681c42b9;p=thirdparty%2Fshadow.git

stat shadows another stat variable. Remove this
variable, and directly check the result of getfscreatecon().
---

diff --git a/ChangeLog b/ChangeLog
index d04f8c3e7..6c9062304 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,8 @@
 	* lib/gshdow.c: list() is an external function. DO not shadow it
 	with a static function. The internal list() was renamed
 	build_list().
+	* lib/commonio.c: stat shadows another stat variable. Remove this
+	variable, and directly check the result of getfscreatecon().
 
 2008-01-01  Nicolas François  <nicolas.francois@centraliens.net>
 
diff --git a/lib/commonio.c b/lib/commonio.c
index 58b4b562a..672631fa1 100644
--- a/lib/commonio.c
+++ b/lib/commonio.c
@@ -692,9 +692,7 @@ int commonio_close (struct commonio_db *db)
 		}
 #ifdef WITH_SELINUX
 		if (db->scontext != NULL) {
-			int stat = getfscreatecon (&old_context);
-
-			if (stat < 0) {
+			if (getfscreatecon (&old_context) < 0) {
 				errors++;
 				goto fail;
 			}