diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-30 20:57:13 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-30 20:57:13 +0000 |
commit | e1503d210a99bbcd0476a6204d62238f5507049c (patch) | |
tree | 5e94239745b60bf918eb95e621b09fe7d1907de1 | |
parent | 15b2d4eac53ac266ee787f9ad4936636570950f7 (diff) |
Merged revisions 255410 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r255410 | russell | 2010-03-30 15:56:26 -0500 (Tue, 30 Mar 2010) | 9 lines
Merged revisions 255409 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r255409 | russell | 2010-03-30 15:56:00 -0500 (Tue, 30 Mar 2010) | 2 lines
Don't kill Asterisk if the H323 listener does not start.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@255411 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channels/chan_h323.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c index 8c4d734e4..081f8c8ff 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -3304,7 +3304,7 @@ static enum ast_module_load_result load_module(void) ASTOBJ_CONTAINER_DESTROYALL(&aliasl, oh323_destroy_alias); ASTOBJ_CONTAINER_DESTROY(&aliasl); - return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_DECLINE; } /* Possibly register with a GK */ if (!gatekeeper_disable) { |