Skip to content

L
lxc
Commit d80cfe71 by Serge Hallyn Committed by Daniel Lezcano
Options

apparmor support: fix compilation with --disable-apparmor

Make the prototypes and functions match between apparmor.{c,h} Signed-off-by: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com> Signed-off-by: 's avatarDaniel Lezcano <dlezcano@fr.ibm.com>
parent 40f6ee00
Showing with 5 additions and 3 deletions
src/lxc/apparmor.c
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
#include <sys/mount.h> #include <sys/mount.h>
#include "log.h" #include "log.h"
#include "apparmor.h"
lxc_log_define(lxc_apparmor, lxc); lxc_log_define(lxc_apparmor, lxc);
#if HAVE_APPARMOR #if HAVE_APPARMOR
#include "apparmor.h"
#include <sys/apparmor.h> #include <sys/apparmor.h>
#define AA_MOUNT_RESTR "/sys/kernel/security/apparmor/features/mount/mask" #define AA_MOUNT_RESTR "/sys/kernel/security/apparmor/features/mount/mask"
......
src/lxc/apparmor.h
...@@ -8,9 +8,11 @@ extern int apparmor_load(struct lxc_handler *handler); ...@@ -8,9 +8,11 @@ extern int apparmor_load(struct lxc_handler *handler);
extern int lsm_mount_proc_if_needed(char *root_src, char *rootfs_tgt); extern int lsm_mount_proc_if_needed(char *root_src, char *rootfs_tgt);
extern void apparmor_handler_init(struct lxc_handler *handler); extern void apparmor_handler_init(struct lxc_handler *handler);
#else #else
extern int apparmor_load(struct lxc_handler *handler); static inline int apparmor_load(struct lxc_handler *handler) {
return 0;
}
static inline int lsm_mount_proc_if_needed(char *root_src, char *rootfs_tgt) { static inline int lsm_mount_proc_if_needed(char *root_src, char *rootfs_tgt) {
return 0; return 0;
} }
extern void apparmor_handler_init(struct lxc_handler *handler) { } extern void apparmor_handler_init(struct lxc_handler *handler);
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment