Remove or lower the priority of some debug messages.

[tinc] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index b7c0179..09f2d13 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -2,7 +2,7 @@
     conf.c -- configuration code
     Copyright (C) 1998 Robert van der Meulen
                   1998-2005 Ivo Timmermans
-                  2000-2010 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
                   2010-2011 Julien Muchembled <jm@jmuchemb.eu>
                  2000 Cris van Pelt
 
@@ -378,6 +378,29 @@ bool read_server_config(void) {
        xasprintf(&fname, "%s/tinc.conf", confbase);
        x = read_config_file(config_tree, fname);
 
+       // We will try to read the conf files in the "conf.d" dir
+       if (x) {
+               char * dname;
+               xasprintf(&dname, "%s/conf.d", confbase);
+               DIR *dir = opendir (dname);
+               // If we can find this dir
+               if (dir) { 
+                       struct dirent *ep;
+                       // We list all the files in it
+                       while (x && (ep = readdir (dir))) {
+                               size_t l = strlen(ep->d_name);
+                               // And we try to read the ones that end with ".conf"
+                               if (l > 5 && !strcmp(".conf", & ep->d_name[ l - 5 ])) {
+                                       free(fname);
+                                       xasprintf(&fname, "%s/%s", dname, ep->d_name);
+                                       x = read_config_file(config_tree, fname);
+                               }
+                       }
+                       closedir (dir);
+               }
+               free(dname);
+       }
+
        if(!x) {                                /* System error: complain */
                logger(LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));
        }