apparmor support: fix compilation with --disable-apparmor

Make the prototypes and functions match between apparmor.{c,h} Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

apparmor support: fix compilation with --disable-apparmor
d80cfe71 · Serge Hallyn · Daniel Lezcano · 40f6ee00 · d80cfe71 · d80cfe71
Commit d80cfe71 authored Jul 31, 2012 by Serge Hallyn Committed by Daniel Lezcano Jul 31, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

apparmor.c src/lxc/apparmor.c +1 -1

apparmor.h src/lxc/apparmor.h +4 -2

No files found.
--- a/src/lxc/apparmor.c
+++ b/src/lxc/apparmor.c
@@ -6,11 +6,11 @@
 #include <sys/mount.h>

 #include "log.h"
+#include "apparmor.h"

 lxc_log_define(lxc_apparmor, lxc);

 #if HAVE_APPARMOR
-#include "apparmor.h"
 #include <sys/apparmor.h>

 #define AA_MOUNT_RESTR "/sys/kernel/security/apparmor/features/mount/mask"

--- a/src/lxc/apparmor.h
+++ b/src/lxc/apparmor.h
@@ -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 void apparmor_handler_init(struct lxc_handler *handler);
 #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) {
 	return 0;
 }
-extern void apparmor_handler_init(struct lxc_handler *handler) { }
+extern void apparmor_handler_init(struct lxc_handler *handler);
 #endif