From cdfa29e2b1a4dd789c6f35b4d90814a19edadc66 Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Fri, 11 May 2007 21:15:30 +0000
Subject: [PATCH] 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
---
Makefile | 2 +-
main/asterisk.c | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index ae4b0464c4..aa7de5aa73 100644
--- a/Makefile
+++ b/Makefile
@@ -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" ; \
diff --git a/main/asterisk.c b/main/asterisk.c
index c44e2cbd67..a8dd93d75b 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -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")) {
--
GitLab