sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better fallback method for autosystemname. 

Issue 9713, patch by Juggie with minor mods by me.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64012 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker 2007-05-11 21:15:30 +00:00
parent 8b5634e4b4
commit cdfa29e2b1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -545,7 +545,7 @@ samples: adsi
echo ";[options]" ; \
echo ";internal_timing = yes" ; \
echo ";systemname = my_system_name ; prefix uniqueid with a system name for global uniqueness issues" ; \
echo ";autosystemname = yes ; automatically set systemname to hostname - uses 'localhost' on failure" ; \
echo ";autosystemname = yes ; automatically set systemname to hostname - uses 'localhost' on failure, or systemname if set" ; \
echo "; Changing the following lines may compromise your security." ; \
echo ";[files]" ; \
echo ";astctlpermissions = 0660" ; \

6
main/asterisk.c
View File

@ -2529,8 +2529,10 @@ static void ast_readconfig(void)
if (!gethostname(hostname, sizeof(hostname) - 1))
ast_copy_string(ast_config_AST_SYSTEM_NAME, hostname, sizeof(ast_config_AST_SYSTEM_NAME));
else {
ast_log(LOG_ERROR, "Cannot obtain hostname for this system. Using 'localhost' instead.\n");
ast_copy_string(ast_config_AST_SYSTEM_NAME, "localhost", sizeof(ast_config_AST_SYSTEM_NAME));
if (!ast_strlen_zero(ast_config_AST_SYSTEM_NAME)){
ast_copy_string(ast_config_AST_SYSTEM_NAME, "localhost", sizeof(ast_config_AST_SYSTEM_NAME));
}
ast_log(LOG_ERROR, "Cannot obtain hostname for this system. Using '%s' instead.\n", ast_config_AST_SYSTEM_NAME);
}
}
} else if (!strcasecmp(v->name, "languageprefix")) {