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.2@255413 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 720236cb921bd48d5ea42148a8a6d4aef8551b53..f741a407949d8f4711723db7e91e505fbf7b9249 100644 (file)
--- 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) {