From: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Date: Sat, 16 Oct 2010 10:03:04 +0000 (+0000)
Subject: Base directory for MOH should be ASTDATADIR
X-Git-Tag: 1.6.2.15-rc1~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e1ba290b3df46c4d5714e4f182b63dc8558772c;p=thirdparty%2Fasterisk.git

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/branches/1.6.2@292049 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/configs/musiconhold.conf.sample b/configs/musiconhold.conf.sample
index 8ccc851e4f..c7d2b1859e 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 fcae10f0e5..7499abde76 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -989,7 +989,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 {