diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2010-10-16 11:51:54 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2010-10-16 11:51:54 +0000 |
| commit | 4d6eac52826fa24a6469335a1aa46cccf47945c0 (patch) | |
| tree | 8b26cf3a73dee3d427ba27b99333cba5d9aef396 | |
| parent | c81da53206ebf7d0d6543ab2d4896da1f27a261b (diff) | |
Merged revisions 292050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r292050 | tzafrir | 2010-10-16 12:47:00 +0200 (ש', 16 אוק 2010) | 22 lines
Merged revisions 292049 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r292049 | tzafrir | 2010-10-16 12:03:04 +0200 (ש', 16 אוק 2010) | 15 lines
Base directory for MOH should be ASTDATADIR
If the directive 'directory' is relative, make it relative to the
datadir, rather than to the varlibdir. In the sample configuration
it is relative ('moh').
This has no effect unless you have actively set the datadir explicitly
(at build time or at run time).
(closes issue #16906)
Patches:
moh_datadir uploaded by tzafrir (license 46)
Review: https://reviewboard.asterisk.org/r/974/
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@292052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | configs/musiconhold.conf.sample | 2 | ||||
| -rw-r--r-- | res/res_musiconhold.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configs/musiconhold.conf.sample b/configs/musiconhold.conf.sample index 714e26403..9147588f1 100644 --- a/configs/musiconhold.conf.sample +++ b/configs/musiconhold.conf.sample @@ -31,7 +31,7 @@ ; ; The path specified can be either an absolute path (starts with '/'), ; or a relative path; relative paths are interpreted as being relative -; to the 'astvarlibdir' in asterisk.conf, which defaults to +; to the 'astdatalibdir' in asterisk.conf, which defaults to ; /var/lib/asterisk. ; ; NOTE: diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 6024e9da8..f0ef9b88c 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -1022,7 +1022,7 @@ static int moh_scan_files(struct mohclass *class) { int i; if (class->dir[0] != '/') { - ast_copy_string(dir_path, ast_config_AST_VAR_DIR, sizeof(dir_path)); + ast_copy_string(dir_path, ast_config_AST_DATA_DIR, sizeof(dir_path)); strncat(dir_path, "/", sizeof(dir_path) - 1); strncat(dir_path, class->dir, sizeof(dir_path) - 1); } else { |