rcfile shouldn't be recorded in lxc_conf if the attempt to load a config file fails

Though it's more subtle than that. If the file doesn't exist or we can't access it, then don't record it. But if we have parse errors, then do. This is mainly to help out API users who try to read a container configuration file before calling c->create(). If the file doesn't exist, then without this patch the subsequent create() will not use the default /etc/lxc/default.conf. The API user could check for the file ahead of time, but this check makes his life easier without costing us anything. Signed-off-by: S.Çağlar Onur" <caglar@10ur.org> Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

rcfile shouldn't be recorded in lxc_conf if the attempt to load a config file fails
f3ca99fd · Serge Hallyn · bb787bc5 · f3ca99fd
Commit f3ca99fd authored Mar 28, 2013 by Serge Hallyn
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

confile.c src/lxc/confile.c +3 -0

No files found.
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -1422,6 +1422,9 @@ int lxc_config_readline(char *buffer, struct lxc_conf *conf)
 int lxc_config_read(const char *file, struct lxc_conf *conf)
 {
+	if( access(file, R_OK) == -1 ) {
+		return -1;
+	}
 	/* Catch only the top level config file name in the structure */
 	if( ! conf->rcfile ) {
 		conf->rcfile = strdup( file );