diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-30 20:58:22 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-30 20:58:22 +0000 |
commit | 2e322b39295a49a14e1d223326ef9fa592f603c8 (patch) | |
tree | cda88a6fa3d2a471859fc5acc20edcc2a7e9b4ad /channels | |
parent | 972f072a620d15a2407e0445e8ae5c2e4f375806 (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.2@255413 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-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 720236cb9..f741a4079 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -3310,7 +3310,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) { |