summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Spencer <markster@digium.com>2004-12-15 16:00:10 +0000
committerMark Spencer <markster@digium.com>2004-12-15 16:00:10 +0000
commit54b418482f903599d1a6fa5e0bda55a4e1969641 (patch)
treec65f2c451cbbf5a4746512d9319b71c97861c31a
parent5d92e208768eaa017de69c0e9a35d2a929279978 (diff)
Fix glob issue on solaris (bug #3047)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4453 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-xconfig.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/config.c b/config.c
index 4eaf9e4aa..20f99f723 100755
--- 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 */
- 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);