From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 30 Mar 2010 20:56:26 +0000 (+0000)
Subject: Merged revisions 255409 via svnmerge from
X-Git-Tag: 11.0.0-beta1~3211
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6a759fdfadc4c5625578af0476bf4ae3fdafe31;p=thirdparty%2Fasterisk.git

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/trunk@255410 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index f2a6bc5117..2746199f52 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -3305,7 +3305,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) {