Merge config updates (bug #3406)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4889 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 6 insertions, 6 deletions

diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index b2a07d0b6..5cfc053f0 100755
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -2639,7 +2639,7 @@ static int reload_config(void)
 		return 0;
 	}
 #endif
-	cfg = ast_load(config);
+	cfg = ast_config_load(config);
 
 	/* We *must* have a config file otherwise stop immediately */
 	if (!cfg) {
@@ -2690,7 +2690,7 @@ static int reload_config(void)
 		hp = ast_gethostbyname(ourhost, &ahp);
 		if (!hp) {
 			ast_log(LOG_WARNING, "Unable to get our IP address, Skinny disabled\n");
-			ast_destroy(cfg);
+			ast_config_destroy(cfg);
 			return 0;
 		}
 		memcpy(&__ourip, hp->h_addr, sizeof(__ourip));
@@ -2726,7 +2726,7 @@ static int reload_config(void)
 		skinnysock = socket(AF_INET, SOCK_STREAM, 0);
 		if(setsockopt(skinnysock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) == -1) {
 			ast_log(LOG_ERROR, "Set Socket Options failed: errno %d, %s", errno, strerror(errno));
-			ast_destroy(cfg);
+			ast_config_destroy(cfg);
 			return 0;
 		}
 
@@ -2739,7 +2739,7 @@ static int reload_config(void)
 							strerror(errno));
 				close(skinnysock);
 				skinnysock = -1;
-				ast_destroy(cfg);
+				ast_config_destroy(cfg);
 				return 0;
 			} 
 
@@ -2749,7 +2749,7 @@ static int reload_config(void)
 							strerror(errno));
 					close(skinnysock);
 					skinnysock = -1;
-					ast_destroy(cfg);
+					ast_config_destroy(cfg);
 					return 0;
 			}
 		
@@ -2763,7 +2763,7 @@ static int reload_config(void)
 	ast_mutex_unlock(&netlock);
 
 	/* and unload the configuration when were done */
-	ast_destroy(cfg);
+	ast_config_destroy(cfg);
 
 	return 0;
 }