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.1@255412 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2010-03-30 20:57:48 +00:00
parent dc4af2809b
commit e406f7f781

View File

@@ -3301,7 +3301,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) {