diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-01-30 15:03:20 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-01-30 15:03:20 +0000 |
commit | a8282b50e1826df08d77e3989b637814415b5865 (patch) | |
tree | 03c27ab3cc019e3323dea0a3464f071a18fa1d18 /loader.c | |
parent | 3e152dc0f17e3948a6d3945f203f62060f987c17 (diff) |
Version 0.3.0 from FTP
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@593 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'loader.c')
-rwxr-xr-x | loader.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -28,6 +28,7 @@ #define __USE_GNU #include <pthread.h> #include "asterisk.h" +#include "astconf.h" static char expected_key[] = { 0x8e, 0x93, 0x22, 0x83, 0xf5, 0xc3, 0xc0, 0x75, @@ -204,7 +205,7 @@ int ast_load_resource(char *resource_name) if (resource_name[0] == '/') { strncpy(fn, resource_name, sizeof(fn)-1); } else { - snprintf(fn, sizeof(fn), "%s/%s", AST_MODULE_DIR, resource_name); + snprintf(fn, sizeof(fn), "%s/%s", (char *)ast_config_AST_MODULE_DIR, resource_name); } m->lib = dlopen(fn, flags); if (!m->lib) { @@ -331,7 +332,7 @@ int load_modules() int x; /* Make two passes. First, load any resource modules, then load the others. */ for (x=0;x<2;x++) { - mods = opendir(AST_MODULE_DIR); + mods = opendir((char *)ast_config_AST_MODULE_DIR); if (mods) { while((d = readdir(mods))) { /* Must end in .so to load it. */ @@ -374,7 +375,7 @@ int load_modules() closedir(mods); } else { if (!option_quiet) - ast_log(LOG_WARNING, "Unable to open modules directory " AST_MODULE_DIR ".\n"); + ast_log(LOG_WARNING, "Unable to open modules directory %s.\n", (char *)ast_config_AST_MODULE_DIR); } } } |