From: Russell Bryant Date: Tue, 30 Mar 2010 20:57:13 +0000 (+0000) Subject: Merged revisions 255410 via svnmerge from X-Git-Tag: 1.6.0.27-rc1~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74e4fc665b84a9ca60c6c6daf1226bf9ca8fb5f8;p=thirdparty%2Fasterisk.git 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@255411 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_h323.c b/channels/chan_h323.c index 8c4d734e4b..081f8c8ff4 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) {