picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

smack-util: remove warning when building without SMACK support

Browse source
This commit is contained in:
Lennart Poettering 2014-12-04 16:17:18 +01:00
parent 584d0d2aef
commit fae5694e1a
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/shared/smack-util.c
View file

@ -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 #ifdef HAVE_SMACK
struct stat st; struct stat st;
#endif
int r = 0;
assert(path); assert(path);
#ifdef HAVE_SMACK
if (!mac_smack_use()) if (!mac_smack_use())
return 0; return 0;
@ -194,8 +199,7 @@ int mac_smack_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
if (ignore_erofs && errno == EROFS) if (ignore_erofs && errno == EROFS)
return 0; return 0;
log_debug_errno(errno, "Unable to fix SMACK label of %s: %m", path); r = log_debug_errno(errno, "Unable to fix SMACK label of %s: %m", path);
r = -errno;
} }
#endif #endif