X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=fcd7c46bda64db76d34708ba98c194a318249ad5;hp=3c645197275c74d351945783ff3fbb9090cd95ca;hb=c8543bbe6b9ae2de318b0ed4f54cdebcbc3fe5a4;hpb=e6b32936c569d9f2ceaea76af2f8f0551d163dd9

diff --git a/src/conf.c b/src/conf.c
index 3c645197..fcd7c46b 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -376,6 +376,29 @@ bool read_server_config(void) {
 	errno = 0;
 	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" SLASH "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" SLASH "%s", dname, ep->d_name);
+					x = read_config_file(config_tree, fname);
+				}
+			}
+			closedir (dir);
+		}
+		free(dname);
+	}
+
 	if(!x && errno)
 		logger(DEBUG_ALWAYS, LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));