kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 18:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add alternative name for config option.

Browse Source 
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/branches/1.8@305247 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2011-01-31 22:25:23 +00:00
parent 9f1bd1cc31
commit 1d498760ef
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configs/sip.conf.sample
View File

@@ -447,7 +447,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls
; you should have their certificate installed here so the code can ; you should have their certificate installed here so the code can
; verify the authenticity of their certificate. ; verify the authenticity of their certificate.
;tlscadir=</path/to/ca/dir> ;tlscapath=</path/to/ca/dir>
; A directory full of CA certificates. The files must be named with ; A directory full of CA certificates. The files must be named with
; the CA subject name hash value. ; the CA subject name hash value.
; (see man SSL_CTX_load_verify_locations for more info) ; (see man SSL_CTX_load_verify_locations for more info)

2
main/tcptls.c
View File

@@ -550,7 +550,7 @@ int ast_tls_read_conf(struct ast_tls_config *tls_cfg, struct ast_tcptls_session_
} else if (!strcasecmp(varname, "tlscafile")) { } else if (!strcasecmp(varname, "tlscafile")) {
ast_free(tls_cfg->cafile); ast_free(tls_cfg->cafile);
tls_cfg->cafile = ast_strdup(value); tls_cfg->cafile = ast_strdup(value);
} else if (!strcasecmp(varname, "tlscapath")) { } else if (!strcasecmp(varname, "tlscapath") || !strcasecmp(varname, "tlscadir")) {
ast_free(tls_cfg->capath); ast_free(tls_cfg->capath);
tls_cfg->capath = ast_strdup(value); tls_cfg->capath = ast_strdup(value);
} else if (!strcasecmp(varname, "tlsverifyclient")) { } else if (!strcasecmp(varname, "tlsverifyclient")) {