pidgin: 668223e9: jabber: Commit some non-existent code.

darkrain42 at pidgin.im darkrain42 at pidgin.im
Wed Sep 29 01:16:54 EDT 2010


----------------------------------------------------------------------
Revision: 668223e9499d74848ca30317bdb369033b9133db
Parent:   392f12982208f8dc177e4b05a966b210dcd34fe4
Author:   darkrain42 at pidgin.im
Date:     09/29/10 01:11:09
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/668223e9499d74848ca30317bdb369033b9133db

Changelog: 

jabber: Commit some non-existent code.

(I'm trying to see if I can find a server that supports SASL
security layers via Cyrus SASL)

Changes against parent 392f12982208f8dc177e4b05a966b210dcd34fe4

  patched  libpurple/protocols/jabber/jabber.c

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c	ceae25989c6ecdde4a8f86f97d97ac4628e45013
+++ libpurple/protocols/jabber/jabber.c	14a09aadef4856131ea47313ce753823694dcc26
@@ -220,11 +220,30 @@ jabber_process_starttls(JabberStream *js
 
 	account = purple_connection_get_account(js->gc);
 
+#if 0
+	/*
+	 * This code DOES NOT EXIST, will never be enabled by default, and
+	 * will never ever be supported (by me).
+	 * It's literally *only* for developer testing.
+	 */
+	{
+		const gchar *connection_security = purple_account_get_string(account, "connection_security", JABBER_DEFAULT_REQUIRE_TLS);
+		if (!g_str_equal(connection_security, "none") &&
+				purple_ssl_is_supported()) {
+			jabber_send_raw(js,
+					"<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>", -1);
+			return TRUE;
+		}
+	}
+#else
 	if(purple_ssl_is_supported()) {
 		jabber_send_raw(js,
 				"<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>", -1);
 		return TRUE;
+	} else { 
+		purple_debug_warning("jabber", "No TLS/SSL support found.");
 	}
+#endif
 
 	starttls = xmlnode_get_child(packet, "starttls");
 	if(xmlnode_get_child(starttls, "required")) {


More information about the Commits mailing list