Fix Windows version not starting if include_dir did not contain any f…

…iles. Closes #566. Thanks to marleau.
eclipse · Sep 25, 2018 · 588d39e · 588d39e
1 parent d9fc9cd
commit 588d39e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -9,6 +9,8 @@ Broker:
 - Documentation fixes. Closes #520, #600.
 - Fix duplicate clients being added to by_id hash before the old client was
   removed. Closes #645.
+- Fix Windows version not starting if include_dir did not contain any files.
+  Closes #566.
 
 Build:
 - Various fixes to ease building.

diff --git a/src/conf.c b/src/conf.c
@@ -1208,8 +1208,8 @@ int config__read_file_core(struct mosquitto__config *config, bool reload, struct
 						snprintf(dirpath, MAX_PATH, "%s\\*.conf", token);
 						fh = FindFirstFile(dirpath, &find_data);
 						if(fh == INVALID_HANDLE_VALUE){
-							log__printf(NULL, MOSQ_LOG_ERR, "Error: Unable to open include_dir '%s'.", token);
-							return 1;
+							/* No files found */
+							continue;
 						}
 
 						do{