summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2017-09-26 07:29:20 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2017-09-26 07:29:20 -0500
commit4e4520854a3ac9862e1165c520154f729b157361 (patch)
tree44d1127de63526cda0f67ff1f85ec87d39050870
parent63c9f838ad2d8b702a2b8c13e2c20b99cb7f1d42 (diff)
parenta89f14f2d6bf8c37f795b75c8c315136fffcccf5 (diff)
Merge "webrtc: Allow 'webrtc' to be set on endpoints without dtls_ca_file" into 15
-rw-r--r--res/res_pjsip/pjsip_configuration.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c
index cba8a7e7f..3a752c90d 100644
--- a/res/res_pjsip/pjsip_configuration.c
+++ b/res/res_pjsip/pjsip_configuration.c
@@ -1363,10 +1363,9 @@ static int sip_endpoint_apply_handler(const struct ast_sorcery *sorcery, void *o
endpoint->media.rtp.dtls_cfg.default_setup = AST_RTP_DTLS_SETUP_ACTPASS;
endpoint->media.rtp.dtls_cfg.verify = AST_RTP_DTLS_VERIFY_FINGERPRINT;
- if (ast_strlen_zero(endpoint->media.rtp.dtls_cfg.certfile) ||
- (ast_strlen_zero(endpoint->media.rtp.dtls_cfg.cafile))) {
+ if (ast_strlen_zero(endpoint->media.rtp.dtls_cfg.certfile)) {
ast_log(LOG_ERROR, "WebRTC can't be enabled on endpoint '%s' - a DTLS cert "
- "or ca file has not been specified", ast_sorcery_object_get_id(endpoint));
+ "has not been specified", ast_sorcery_object_get_id(endpoint));
return -1;
}
}