[svn-commits] tilghman: trunk r283176 - in /trunk: ./ res/res_stun_monitor.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon Aug 23 07:09:17 2010
New Revision: 283176

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=283176
Log:
Merged revisions 283175 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r283175 | tilghman | 2010-08-23 07:06:26 -0500 (Mon, 23 Aug 2010) | 2 lines
  
  Don't fail to start if the config file is missing.
........

Modified:
    trunk/   (props changed)
    trunk/res/res_stun_monitor.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/res/res_stun_monitor.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_stun_monitor.c?view=diff&rev=283176&r1=283175&r2=283176
==============================================================================
--- trunk/res/res_stun_monitor.c (original)
+++ trunk/res/res_stun_monitor.c Mon Aug 23 07:09:17 2010
@@ -297,7 +297,7 @@
 	if (__reload(1)) {
 		stun_stop_monitor();
 		ast_mutex_destroy(&args.lock);
-		return AST_MODULE_LOAD_FAILURE;
+		return AST_MODULE_LOAD_DECLINE;
 	}
 
 	return AST_MODULE_LOAD_SUCCESS;