From: Ferenc Wagner <wferi@niif.hu>
Date: Mon, 7 Jun 2010 09:33:56 +0000 (+0200)
Subject: conditional use of new capabilities
X-Git-Tag: lxc-0.7.0~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9527e566fcb52d851533d41b549e2cf523dfd95b;p=thirdparty%2Flxc.git

conditional use of new capabilities

Signed-off-by: Ferenc Wagner <wferi@niif.hu>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 3d550a71d..9565d914d 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -170,8 +170,12 @@ static struct caps_opt caps_opt[] = {
 	{ "sys_tty_config",    CAP_SYS_TTY_CONFIG    },
 	{ "mknod",             CAP_MKNOD             },
 	{ "lease",             CAP_LEASE             },
+#ifdef CAP_AUDIT_WRITE
 	{ "audit_write",       CAP_AUDIT_WRITE       },
+#endif
+#ifdef CAP_AUDIT_CONTROL
 	{ "audit_control",     CAP_AUDIT_CONTROL     },
+#endif
 	{ "setfcap",           CAP_SETFCAP           },
 	{ "mac_override",      CAP_MAC_OVERRIDE      },
 	{ "mac_admin",         CAP_MAC_ADMIN         },