Patch from tilman2: Don't print null config file name

diff --git a/src/conf.c b/src/conf.c
index d85ff7c0eb20aef5613d3fc1661e8ed016fd264a..185e508a0b97bff9101f135df38514da1e8ffdd6 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -50,14 +50,10 @@ const char defaultconfig[] = DEFAULT_CONFIG;
 
 int Conf_init(const char *conffile)
 {
-       const char *conf;
-       
        config_init(&configuration);
        if (conffile == NULL)
-               conf = defaultconfig;
-       else
-               conf = conffile;
-       if (config_read_file(&configuration, conf) != CONFIG_TRUE) {
+               conffile = defaultconfig;
+       if (config_read_file(&configuration, conffile) != CONFIG_TRUE) {
                fprintf(stderr, "Error in config file %s: %s at line %d\n", conffile,
                                config_error_text(&configuration), config_error_line(&configuration));
                exit(1);