summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Bright <sean.bright@gmail.com>2017-11-06 09:05:56 -0500
committerSean Bright <sean.bright@gmail.com>2017-11-06 09:15:33 -0500
commite3f25899ecb60fccbb9d0b95e386d2ec551542b6 (patch)
tree9b0194f0156216ae2d3aa0440864735383f1cb71
parent883005c163911d80c295c6e436e85f58e94a7bfd (diff)
res_pjsip: Ignore empty TLS configuration
When using realtime, fields that are not explicitly set by an administrator are still presented to sorcery as empty strings. Handle this case explicitly. In this particular case, if any of these fields are required for TLS support, their existence should be validated in the 'apply' handler once we have a complete transport definition. ASTERISK-27032 #close Reported by: seanchann.zhou Change-Id: Ie3b5fb421977ccdb33e415d4ec52c3fd192601b7
-rw-r--r--res/res_pjsip/config_transport.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/res/res_pjsip/config_transport.c b/res/res_pjsip/config_transport.c
index 0c804b82a..2f29456ab 100644
--- a/res/res_pjsip/config_transport.c
+++ b/res/res_pjsip/config_transport.c
@@ -683,6 +683,11 @@ static int transport_tls_file_handler(const struct aco_option *opt, struct ast_v
return -1;
}
+ if (ast_strlen_zero(var->value)) {
+ /* Ignore empty options */
+ return 0;
+ }
+
if (!ast_file_is_readable(var->value)) {
ast_log(LOG_ERROR, "Transport: %s: %s %s is either missing or not readable\n",
ast_sorcery_object_get_id(obj), var->name, var->value);