chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
584d0d2
)
smack-util: remove warning when building without SMACK support
author
Lennart Poettering
<lennart@poettering.net>
Thu, 4 Dec 2014 15:17:18 +0000
(16:17 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 4 Dec 2014 15:17:34 +0000
(16:17 +0100)
src/shared/smack-util.c
patch
|
blob
|
history
diff --git
a/src/shared/smack-util.c
b/src/shared/smack-util.c
index a62c479900efd3b58b6f8ee7bbabb741287dc375..64e213489e21726047f71f6898e4f5fd8536fbbf 100644
(file)
--- a/
src/shared/smack-util.c
+++ b/
src/shared/smack-util.c
@@
-125,8
+125,11
@@
int mac_smack_apply_ip_in_fd(int fd, const char *label) {
}
int mac_smack_apply_pid(pid_t pid, const char *label) {
}
int mac_smack_apply_pid(pid_t pid, const char *label) {
- int r = 0;
+
+#ifdef HAVE_SMACK
const char *p;
const char *p;
+#endif
+ int r = 0;
assert(label);
assert(label);
@@
-144,13
+147,15
@@
int mac_smack_apply_pid(pid_t pid, const char *label) {
}
int mac_smack_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
}
int mac_smack_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
- int r = 0;
#ifdef HAVE_SMACK
struct stat st;
#ifdef HAVE_SMACK
struct stat st;
+#endif
+ int r = 0;
assert(path);
assert(path);
+#ifdef HAVE_SMACK
if (!mac_smack_use())
return 0;
if (!mac_smack_use())
return 0;
@@
-194,8
+199,7
@@
int mac_smack_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
if (ignore_erofs && errno == EROFS)
return 0;
if (ignore_erofs && errno == EROFS)
return 0;
- log_debug_errno(errno, "Unable to fix SMACK label of %s: %m", path);
- r = -errno;
+ r = log_debug_errno(errno, "Unable to fix SMACK label of %s: %m", path);
}
#endif
}
#endif