43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
|
From 8878751819531b402859ec07d23da745a873092a Mon Sep 17 00:00:00 2001
|
||
|
|
From: chrfranke <authors@smartmontools.org>
|
||
|
|
Date: Thu, 16 Nov 2017 21:38:28 +0000
|
||
|
|
Subject: [PATCH 028/291] os_linux.cpp: Add missing braces to 3ware SELinux
|
||
|
|
code. This possibly harmless bug was introduced ~10 years ago in r2510. It is
|
||
|
|
now detected by g++ 6.3 -Wmisleading-indentation warning.
|
||
|
|
|
||
|
|
git-svn-id: http://svn.code.sf.net/p/smartmontools/code/trunk@4624 4ea69e1a-61f1-4043-bf83-b5c94c648137
|
||
|
|
---
|
||
|
|
smartmontools/ChangeLog | 4 ++++
|
||
|
|
smartmontools/os_linux.cpp | 5 +++--
|
||
|
|
2 files changed, 7 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/smartmontools/os_linux.cpp b/smartmontools/os_linux.cpp
|
||
|
|
index a1fb6a7f..51f78b92 100644
|
||
|
|
--- a/smartmontools/os_linux.cpp
|
||
|
|
+++ b/smartmontools/os_linux.cpp
|
||
|
|
@@ -5,7 +5,7 @@
|
||
|
|
*
|
||
|
|
* Copyright (C) 2003-11 Bruce Allen
|
||
|
|
* Copyright (C) 2003-11 Doug Gilbert <dgilbert@interlog.com>
|
||
|
|
- * Copyright (C) 2008-16 Christian Franke
|
||
|
|
+ * Copyright (C) 2008-17 Christian Franke
|
||
|
|
*
|
||
|
|
* Original AACRaid code:
|
||
|
|
* Copyright (C) 2014 Raghava Aditya <raghava.aditya@pmcs.com>
|
||
|
|
@@ -1626,10 +1626,11 @@ static int setup_3ware_nodes(const char *nodename, const char *driver_name)
|
||
|
|
pout("Error initializing contexts database for /dev");
|
||
|
|
if (getfscreatecon(&orig_context) < 0) {
|
||
|
|
pout("Error retrieving original SELinux fscreate context");
|
||
|
|
- if (selinux_enforced)
|
||
|
|
+ if (selinux_enforced) {
|
||
|
|
matchpathcon_fini();
|
||
|
|
return 6;
|
||
|
|
}
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
/* Now check if nodes are correct */
|
||
|
|
--
|
||
|
|
2.19.1
|
||
|
|
|