]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-4069 --resolve
authorAnthony Minessale <anthm@freeswitch.org>
Tue, 10 Apr 2012 17:39:00 +0000 (12:39 -0500)
committerAnthony Minessale <anthm@freeswitch.org>
Tue, 10 Apr 2012 17:39:00 +0000 (12:39 -0500)
src/mod/applications/mod_voicemail/mod_voicemail.c

index 968a9d57f77161644be35c23409c0b448ede2723..0fe46155bc60d2088567f6485995e8b8fb7fc454 100644 (file)
@@ -629,6 +629,7 @@ vm_profile_t *profile_set_config(vm_profile_t *profile)
        SWITCH_CONFIG_SET_ITEM(profile->config[i++], "email_date-fmt", SWITCH_CONFIG_STRING, CONFIG_RELOADABLE,
                                                   &profile->date_fmt, "%A, %B %d %Y, %I:%M %p", &profile->config_str_pool, NULL, NULL);
        SWITCH_CONFIG_SET_ITEM(profile->config[i++], "odbc-dsn", SWITCH_CONFIG_STRING, 0, &profile->odbc_dsn, NULL, &profile->config_str_pool, NULL, NULL);
+       SWITCH_CONFIG_SET_ITEM(profile->config[i++], "dbname", SWITCH_CONFIG_STRING, 0, &profile->dbname, NULL, &profile->config_str_pool, NULL, NULL);
        SWITCH_CONFIG_SET_ITEM_CALLBACK(profile->config[i++], "email_template-file", SWITCH_CONFIG_CUSTOM, CONFIG_RELOADABLE,
                                                                        NULL, NULL, profile, vm_config_email_callback, NULL, NULL);
        SWITCH_CONFIG_SET_ITEM_CALLBACK(profile->config[i++], "email_notify-template-file", SWITCH_CONFIG_CUSTOM, CONFIG_RELOADABLE,
@@ -722,7 +723,9 @@ static vm_profile_t *load_profile(const char *profile_name)
                        }
                }
 
-               profile->dbname = switch_core_sprintf(profile->pool, "voicemail_%s", profile_name);
+               if (zstr(profile->dbname)) {
+                       profile->dbname = switch_core_sprintf(profile->pool, "voicemail_%s", profile_name);
+               }
 
                if (!(dbh = vm_get_db_handle(profile))) {
                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot open DB!\n");