Fix regression when using tcpenable=no and tlsenable=yes.
authorWalter Doekes <walter+asterisk@wjd.nu>
Thu, 8 Dec 2011 21:32:36 +0000 (21:32 +0000)
committerWalter Doekes <walter+asterisk@wjd.nu>
Thu, 8 Dec 2011 21:32:36 +0000 (21:32 +0000)
commit463bfdb4009ce23852be8e872ac86c595933cae4
treed8ece9dd9643473e85850c504258f790e3613f8f
parente1884139c478200b46b0332173b60785f1693ef1
Fix regression when using tcpenable=no and tlsenable=yes.

The tlsenable settings are tucked away in main/tcptls.c, so I missed
them when resolving ASTERISK-18837. This should resolve the test suite
breakage of the sip tls tests.

Review: https://reviewboard.asterisk.org/r/1615
Reviewed by: Matt Jordan
........

Merged revisions 347718 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 347727 from http://svn.asterisk.org/svn/asterisk/branches/10

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@347735 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_sip.c