mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
Merged revisions 43472,43495 from trunk
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@43582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -2676,7 +2676,7 @@ static int reload_config(int is_reload)
|
||||
struct oh323_alias *alias = NULL;
|
||||
struct ast_hostent ahp; struct hostent *hp;
|
||||
char *cat;
|
||||
char *utype;
|
||||
const char *utype;
|
||||
int is_user, is_peer, is_alias;
|
||||
char _gatekeeper[100];
|
||||
int gk_discover, gk_disable, gk_changed;
|
||||
@@ -2721,7 +2721,7 @@ static int reload_config(int is_reload)
|
||||
if (ucfg) {
|
||||
struct ast_variable *gen;
|
||||
int genhas_h323;
|
||||
char *has_h323;
|
||||
const char *has_h323;
|
||||
|
||||
genhas_h323 = ast_true(ast_variable_retrieve(ucfg, "general", "hash323"));
|
||||
gen = ast_variable_browse(ucfg, "general");
|
||||
|
Reference in New Issue
Block a user