]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Suffix is not needed for a match
authorTilghman Lesher <tilghman@meg.abyt.es>
Wed, 21 Oct 2009 15:45:54 +0000 (15:45 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Wed, 21 Oct 2009 15:45:54 +0000 (15:45 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@225103 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_voicemail.c

index 2c57e522e0410645ee02ddb4e6d0127155261052..ff577180e0bcc42d8bd9f5eb9a8fa8b3434330f6 100644 (file)
@@ -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);