Fix glob issue on solaris (bug #3047)
authorMark Spencer <markster@digium.com>
Wed, 15 Dec 2004 16:00:10 +0000 (16:00 +0000)
committerMark Spencer <markster@digium.com>
Wed, 15 Dec 2004 16:00:10 +0000 (16:00 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4453 65c4cc65-6c06-0410-ace0-fbb531ad65f3

config.c

index 4eaf9e4..20f99f7 100755 (executable)
--- a/config.c
+++ b/config.c
@@ -513,7 +513,11 @@ static struct ast_config *__ast_load(const char *configfile, struct ast_config *
                int glob_ret;
                glob_t globbuf;
                globbuf.gl_offs = 0;    /* initialize it to silence gcc */
                int glob_ret;
                glob_t globbuf;
                globbuf.gl_offs = 0;    /* initialize it to silence gcc */
-               glob_ret = glob(fn, GLOB_NOMATCH|GLOB_BRACE, NULL, &globbuf);
+#ifdef SOLARIS
+               glob_ret = glob(fn, GLOB_NOMAGIC, NULL, &globbuf);
+#else
+               glob_ret = glob(fn, GLOB_NOMAGIC|GLOB_BRACE, NULL, &globbuf);
+#endif
                if (glob_ret == GLOB_NOSPACE)
                        ast_log(LOG_WARNING,
                                "Glob Expansion of pattern '%s' failed: Not enough memory\n", fn);
                if (glob_ret == GLOB_NOSPACE)
                        ast_log(LOG_WARNING,
                                "Glob Expansion of pattern '%s' failed: Not enough memory\n", fn);