From: Kevin P. Fleming <kpfleming@digium.com>
Date: Wed, 14 Sep 2005 02:52:11 +0000 (+0000)
Subject: don't abort Asterisk load if configuration not found (issue #5115)
X-Git-Tag: 1.2.0-beta2~325
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2e6ac45cac98d60966dd4c9809d8cd9b95f4ae3;p=thirdparty%2Fasterisk.git

don't abort Asterisk load if configuration not found (issue #5115)
don't register channel type until after config has been loaded


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6590 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 9747029997..ca9fd5fefb 100755
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12414,15 +12414,14 @@ int load_module()
 		ast_log(LOG_WARNING, "Unable to create I/O context\n");
 	}
 
+	reload_config();	/* Load the configuration from sip.conf */
+
 	/* Make sure we can register our sip channel type */
 	if (ast_channel_register(&sip_tech)) {
 		ast_log(LOG_ERROR, "Unable to register channel type %s\n", channeltype);
 		return -1;
 	}
 
-	if (reload_config())	/* Load the configuration from sip.conf */
-		return -1;
-
 	/* Register all CLI functions for SIP */
 	ast_cli_register_multiple(my_clis, sizeof(my_clis)/ sizeof(my_clis[0]));