fixup! portability issue, field gl_flags from glob_t is not portable.

diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index 1d8f32da40367d82a55b8ccc67729e56091b8d50..586689a673e59583ef0da722d975a2fdfa94d3f6 100644 (file)
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -14,6 +14,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 #include <glob.h>
 
@@ -3663,7 +3664,7 @@ glob_include(const char * restrict pattern, glob_t * restrict pglob)
                        /* if a magic char (*?[]) was in pattern
                         * and no path matched we report error early,
                         * otherwise proceed as normal */
-                       return (pglob->gl_flags & GLOB_MAGCHAR) ?
+                       return (strpbrk(pattern, "[]*?")) ?
                                        (ISC_R_FILENOTFOUND) : (ISC_R_SUCCESS);
 
                case GLOB_NOSPACE:

diff --git a/util/copyrights b/util/copyrights
index 377b76cf7770a19c5fa367c760a3abb210aa5cbf..2a37ee3792de52829e1e3258ab8cc3108372050e 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -676,6 +676,9 @@
 ./bin/tests/system/idna/tests.sh               SH      2018,2019
 ./bin/tests/system/ifconfig.bat                        BAT     2016,2018,2019
 ./bin/tests/system/ifconfig.sh                 SH      2000,2001,2002,2003,2004,2007,2008,2009,2010,2012,2013,2016,2018,2019
+./bin/tests/system/include-multiplecfg/clean.sh        SH      2019
+./bin/tests/system/include-multiplecfg/setup.sh        SH      2019
+./bin/tests/system/include-multiplecfg/tests.sh        SH      2019
 ./bin/tests/system/inline/clean.sh             SH      2011,2012,2013,2014,2015,2016,2017,2018,2019
 ./bin/tests/system/inline/ns1/sign.sh          SH      2011,2012,2014,2016,2017,2018,2019
 ./bin/tests/system/inline/ns3/sign.sh          SH      2011,2012,2013,2014,2016,2017,2018,2019