projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cc00637
)
Only offer XMPP over TLS if we have OpenSSL in the build.
author
Art Cancro
<ajc@citadel.org>
Mon, 14 Feb 2011 03:46:09 +0000
(22:46 -0500)
committer
Wilfried Goesgens
<dothebart@citadel.org>
Sun, 4 Sep 2011 14:13:41 +0000
(14:13 +0000)
citadel/modules/xmpp/serv_xmpp.c
patch
|
blob
|
history
diff --git
a/citadel/modules/xmpp/serv_xmpp.c
b/citadel/modules/xmpp/serv_xmpp.c
index 01d1301556576c4844686ecefd508280e4f43620..aa3017e49184e2bcd8f993279aa0e489e048c24d 100644
(file)
--- a/
citadel/modules/xmpp/serv_xmpp.c
+++ b/
citadel/modules/xmpp/serv_xmpp.c
@@
-144,13
+144,12
@@
void xmpp_stream_start(void *data, const char *supplied_el, const char **attr)
/*
* TLS encryption (but only if it isn't already active)
- *
- * NOTE: if TLS doesn't handshake properly for whatever reason,
- * comment out these three lines to disable it at the server.
- */
+ */
+#ifdef HAVE_OPENSSL
if (!CC->redirect_ssl) {
cprintf("<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'></starttls>");
}
+#endif
if (!CC->logged_in) {
/* If we're not logged in yet, offer SASL as our feature set */