kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-12 12:58:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "core: Entity ID is not set or invalid" into 13

Browse Source
This commit is contained in:
zuul
2016-08-16 06:43:54 -05:00
committed by Gerrit Code Review
parent 6c4c31456f 403c794684
commit 050b90769a
8 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/asterisk.c
View File

@@ -3752,10 +3752,10 @@ static void ast_readconfig(void)
} else if (!strcasecmp(v->name, "entityid")) {
struct ast_eid tmp_eid;
if (!ast_str_to_eid(&tmp_eid, v->value)) {
ast_verbose("Successfully set global EID to '%s'\n", v->value);
ast_eid_default = tmp_eid;
} else
ast_verbose("Invalid Entity ID '%s' provided\n", v->value);
} else {
ast_log(LOG_WARNING, "Invalid Entity ID '%s' provided\n", v->value);
}
} else if (!strcasecmp(v->name, "lightbackground")) {
ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_LIGHT_BACKGROUND);
} else if (!strcasecmp(v->name, "forceblackbackground")) {