From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Fri, 2 Dec 2016 18:41:11 +0000 (+0100)
Subject: conf: clearly report to either use drop or keep
X-Git-Tag: lxc-2.1.0~232^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1340%2Fhead;p=thirdparty%2Flxc.git

conf: clearly report to either use drop or keep

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 8173b4f60..dbc459d6b 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -3952,7 +3952,7 @@ int lxc_setup(struct lxc_handler *handler)
 
 	if (!lxc_list_empty(&lxc_conf->keepcaps)) {
 		if (!lxc_list_empty(&lxc_conf->caps)) {
-			ERROR("Simultaneously requested dropping and keeping caps");
+			ERROR("Container requests lxc.cap.drop and lxc.cap.keep: either use lxc.cap.drop or lxc.cap.keep, not both.");
 			return -1;
 		}
 		if (dropcaps_except(&lxc_conf->keepcaps)) {