kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 292050 via svnmerge from

Browse Source 
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
This commit is contained in:
Tzafrir Cohen
2010-10-16 11:51:54 +00:00
parent c81da53206
commit 4d6eac5282
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configs/musiconhold.conf.sample
View File

@@ -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:

2
res/res_musiconhold.c
View File

@@ -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 {