From: Michal Grzedzicki <lazy404@gmail.com>
Date: Tue, 21 Jul 2015 08:29:00 +0000 (+0200)
Subject: Only use LOGPATH if lxcpath is unset or default
X-Git-Tag: lxc-2.0.0.beta1~192^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=479bba8b318a9a6a5cf79a57461ac5ec226a1560;p=thirdparty%2Flxc.git

Only use LOGPATH if lxcpath is unset or default

Signed-off-by: Michał Grzędzicki <lazy404@gmail.com>
---

diff --git a/src/lxc/log.c b/src/lxc/log.c
index 201cf474c..f44a1d99b 100644
--- a/src/lxc/log.c
+++ b/src/lxc/log.c
@@ -356,7 +356,7 @@ extern int lxc_log_init(const char *name, const char *file,
 			lxcpath = LOGPATH;
 
 		/* try LOGPATH if lxcpath is the default for the privileged containers */
-		if (!geteuid() && strcmp(lxcpath, lxc_global_config_value("lxc.lxcpath")) == 0)
+		if (!geteuid() && strcmp(LXCPATH, lxcpath) == 0)
 			ret = _lxc_log_set_file(name, NULL, 0);
 
 		/* try in lxcpath */