projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- enable TLS
[citadel.git]
/
citadel
/
modules
/
xmpp
/
serv_xmpp.c
diff --git
a/citadel/modules/xmpp/serv_xmpp.c
b/citadel/modules/xmpp/serv_xmpp.c
index ea58e3b627dbf9efd6fe658419ed5dfc14f29ee5..424c0fdbb20608668c744f99fdd289ee2d6eb3e2 100644
(file)
--- a/
citadel/modules/xmpp/serv_xmpp.c
+++ b/
citadel/modules/xmpp/serv_xmpp.c
@@
-237,13
+237,13
@@
void xmpp_stream_start(void *data, const char *supplied_el, const char **attr)
/*
* TLS encryption (but only if it isn't already active)
*/
/*
* TLS encryption (but only if it isn't already active)
*/
-/*
+
#ifdef HAVE_OPENSSL
if (!CC->redirect_ssl) {
XPUT("<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'></starttls>");
}
#endif
#ifdef HAVE_OPENSSL
if (!CC->redirect_ssl) {
XPUT("<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 */
xmpp_output_auth_mechs();
if (!CC->logged_in) {
/* If we're not logged in yet, offer SASL as our feature set */
xmpp_output_auth_mechs();
@@
-351,7
+351,7
@@
void xmpp_xml_start(void *data, const char *supplied_el, const char **attr)
if (GetHash(th->Properties, attr[i], strlen(attr[i]), &pv))
{
PropertyHandler* ph = pv;
if (GetHash(th->Properties, attr[i], strlen(attr[i]), &pv))
{
PropertyHandler* ph = pv;
-
char
*val;
+
void
*val;
StrBuf **pVal;
long len;
StrBuf **pVal;
long len;