From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Wed, 21 Oct 2009 15:45:54 +0000 (+0000)
Subject: Suffix is not needed for a match
X-Git-Tag: 1.4.27-rc3~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8699a5f1584e6513f432f4b66fcee932cdd03168;p=thirdparty%2Fasterisk.git

Suffix is not needed for a match


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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 2c57e522e0..ff577180e0 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -8889,29 +8889,19 @@ static int unload_module(void)
 static int load_module(void)
 {
 	int res;
-	char *adsi_loaded = ast_module_helper("", "res_adsi.so", 0, 0, 0, 0);
-	char *smdi_loaded = ast_module_helper("", "res_smdi.so", 0, 0, 0, 0);
+	char *adsi_loaded = ast_module_helper("", "res_adsi", 0, 0, 0, 0);
+	char *smdi_loaded = ast_module_helper("", "res_smdi", 0, 0, 0, 0);
 	free(adsi_loaded);
 	free(smdi_loaded);
 
 	if (!adsi_loaded) {
-		/* If embedded, res_adsi may be known as "res_adsi" not "res_adsi.so" */
-		adsi_loaded = ast_module_helper("", "res_adsi", 0, 0, 0, 0);
-		ast_free(adsi_loaded);
-		if (!adsi_loaded) {
-			ast_log(LOG_ERROR, "app_voicemail.so depends upon res_adsi.so\n");
-			return AST_MODULE_LOAD_DECLINE;
-		}
+		ast_log(LOG_ERROR, "app_voicemail.so depends upon res_adsi.so\n");
+		return AST_MODULE_LOAD_DECLINE;
 	}
 
 	if (!smdi_loaded) {
-		/* If embedded, res_smdi may be known as "res_smdi" not "res_smdi.so" */
-		smdi_loaded = ast_module_helper("", "res_smdi", 0, 0, 0, 0);
-		ast_free(smdi_loaded);
-		if (!smdi_loaded) {
-			ast_log(LOG_ERROR, "app_voicemail.so depends upon res_smdi.so\n");
-			return AST_MODULE_LOAD_DECLINE;
-		}
+		ast_log(LOG_ERROR, "app_voicemail.so depends upon res_smdi.so\n");
+		return AST_MODULE_LOAD_DECLINE;
 	}
 
 	my_umask = umask(0);