Allow the same config file to be read twice

Because it's sometimes useful, and as an error, it rarely happens

diff --git a/src/main/conffile.c b/src/main/conffile.c
index 08e69554a3fab2c9f53710e06baa6f7d92a6e671..4f7df2c389df5dab315bb1498ffb937ca54eb894 100644 (file)
--- a/src/main/conffile.c
+++ b/src/main/conffile.c
@@ -339,11 +339,14 @@ static FILE *cf_file_open(CONF_SECTION *cs, char const *filename)
 #endif
        }
 
+       /*
+        *      We can include the same file twice.  e.g. when it
+        *      contains common definitions, such as for SQL.
+        *
+        *      Though the admin should really use templates for that.
+        */
        if (!rbtree_insert(tree, file)) {
-               ERROR("Cannot include the same file twice: \"%s\"", filename);
                talloc_free(file);
-               fclose(fp);
-               return NULL;
        }
 
        return fp;