dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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: http://svn.digium.com/svn/asterisk/trunk@305248 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
qwell 2011-01-31 22:26:06 +00:00
parent a534391181
commit e1cff4ff5a
2 changed files with 2 additions and 2 deletions
Show Stats 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
; 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
; the CA subject name hash value.
; (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")) {
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")) {