From: Pavel Charvat <pavel.charvat@netcentrum.cz>
Date: Tue, 4 Sep 2007 19:22:20 +0000 (+0200)
Subject: library:
X-Git-Tag: holmes-import~506^2~16
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=8f01c7e5788479a93d75bca01f4e47013f0fba67;p=libucw.git

library:
SH_CONFIG environment variable can override the default configuration file
---

diff --git a/lib/conf-input.c b/lib/conf-input.c
index d445a198..a625630a 100644
--- a/lib/conf-input.c
+++ b/lib/conf-input.c
@@ -380,8 +380,16 @@ static void
 load_default(void)
 {
   if (cf_def_file)
-    if (cf_load(cf_def_file))
-      die("Cannot load default config %s", cf_def_file);
+    {
+      char *env = getenv("SH_CONFIG");
+      if (env)
+        {
+	  if (cf_load(env))
+	    die("Cannot load config file %s", env);
+	}
+      if (cf_load(cf_def_file))
+        die("Cannot load default config %s", cf_def_file);
+    }
 }
 
 static void