[asterisk-commits] qwell: trunk r305248 - in /trunk: ./ configs/sip.conf.sample main/tcptls.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Mon Jan 31 16:26:06 2011
New Revision: 305248

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=305248
Log:
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
........

Modified:
    trunk/   (props changed)
    trunk/configs/sip.conf.sample
    trunk/main/tcptls.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/sip.conf.sample?view=diff&rev=305248&r1=305247&r2=305248
==============================================================================
--- trunk/configs/sip.conf.sample (original)
+++ trunk/configs/sip.conf.sample Mon Jan 31 16:26:06 2011
@@ -447,7 +447,7 @@
 ;        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)

Modified: trunk/main/tcptls.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/tcptls.c?view=diff&rev=305248&r1=305247&r2=305248
==============================================================================
--- trunk/main/tcptls.c (original)
+++ trunk/main/tcptls.c Mon Jan 31 16:26:06 2011
@@ -550,7 +550,7 @@
 	} 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")) {