]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
fix cert dir specification when tls is not configured (note, you probably need to...
authorAnthony Minessale <anthm@freeswitch.org>
Tue, 26 Feb 2013 05:12:05 +0000 (23:12 -0600)
committerAnthony Minessale <anthm@freeswitch.org>
Mon, 1 Apr 2013 02:27:26 +0000 (21:27 -0500)
src/mod/endpoints/mod_sofia/sofia.c

index 9c292024d9a232b9236fad6b5b1d176319e70657..c543bb8314dcbed21753336e2d02c81228bef748 100644 (file)
@@ -2430,7 +2430,7 @@ void *SWITCH_THREAD_FUNC sofia_profile_thread_run(switch_thread_t *thread, void
                                                                         NUTAG_WS_URL(profile->ws_bindurl)),
                                                          TAG_IF(profile->wss_bindurl,
                                                                         NUTAG_WSS_URL(profile->wss_bindurl)),
-                                                         TAG_IF(sofia_test_pflag(profile, PFLAG_TLS),
+                                                         TAG_IF(profile->tls_cert_dir,
                                                                         NUTAG_CERTIFICATE_DIR(profile->tls_cert_dir)),
                                                          TAG_IF(sofia_test_pflag(profile, PFLAG_TLS) && profile->tls_passphrase,
                                                                        TPTAG_TLS_PASSPHRASE(profile->tls_passphrase)),
@@ -4671,7 +4671,7 @@ switch_status_t config_sofia(sofia_config_t reload, char *profile_name)
 
                                config_sofia_profile_urls(profile);
 
-                               if (sofia_test_pflag(profile, PFLAG_TLS) && !profile->tls_cert_dir) {
+                               if (!profile->tls_cert_dir) {
                                        profile->tls_cert_dir = switch_core_sprintf(profile->pool, "%s/ssl", SWITCH_GLOBAL_dirs.conf_dir);
                                }