diff options
| author | Jason Parker <jparker@digium.com> | 2011-01-31 22:26:06 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2011-01-31 22:26:06 +0000 |
| commit | 14c158564586f99daf27cbb734af167d1fba6eff (patch) | |
| tree | 31fba1bc6d6c2597bb2c2e233922e1e3b18e9654 /main/tcptls.c | |
| parent | 0bed3e751a6f9f81388e6df2e67c785302924958 (diff) | |
Merged revisions 305247 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r305247 | qwell | 2011-01-31 16:25:23 -0600 (Mon, 31 Jan 2011) | 7 lines
Add alternative name for config option.
The SIP sample configuration had "tlscadir" as the option name, but chan_sip
used the more correct "tlscapath". Now both are accepted.
Discovered (sort of) by a user on IRC in #asterisk
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@305248 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/tcptls.c')
| -rw-r--r-- | main/tcptls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/tcptls.c b/main/tcptls.c index b505f2a01..d0ee3b2aa 100644 --- a/main/tcptls.c +++ b/main/tcptls.c @@ -550,7 +550,7 @@ int ast_tls_read_conf(struct ast_tls_config *tls_cfg, struct ast_tcptls_session_ } else if (!strcasecmp(varname, "tlscafile")) { ast_free(tls_cfg->cafile); tls_cfg->cafile = ast_strdup(value); - } else if (!strcasecmp(varname, "tlscapath")) { + } else if (!strcasecmp(varname, "tlscapath") || !strcasecmp(varname, "tlscadir")) { ast_free(tls_cfg->capath); tls_cfg->capath = ast_strdup(value); } else if (!strcasecmp(varname, "tlsverifyclient")) { |