From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Fri, 1 Sep 2017 09:32:16 +0000 (+0200)
Subject: conf: check if GLOB_NOMAGIC is defined
X-Git-Tag: 3.2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f8fba9a3f7ea7dc68a145d64e9b53297443e888;p=thirdparty%2Fchrony.git

conf: check if GLOB_NOMAGIC is defined

This option is not supported by musl and possibly other libc
implementations.
---

diff --git a/conf.c b/conf.c
index 8a7080c9..232a8909 100644
--- a/conf.c
+++ b/conf.c
@@ -1335,7 +1335,11 @@ parse_include(char *line)
 
   check_number_of_args(line, 1);
 
-  if ((r = glob(line, GLOB_ERR | GLOB_NOMAGIC, NULL, &gl)) != 0) {
+  if ((r = glob(line,
+#ifdef GLOB_NOMAGIC
+                GLOB_NOMAGIC |
+#endif
+                GLOB_ERR, NULL, &gl)) != 0) {
     if (r != GLOB_NOMATCH)
       LOG_FATAL("Could not search for files matching %s", line);