pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [17834] trunk/libgaim/protocols/jabber/auth.c

[<the...@us...>]

Revision: 17834
          http://svn.sourceforge.net/gaim/?rev=17834&view=rev
Author:   thekingant
Date:     2006-11-27 22:59:48 -0800 (Mon, 27 Nov 2006)

Log Message:
-----------
I don't think these parameters are allowed to be null... it looks like it
can cause crashes.  See Red Hat bug #217335.  Thanks to Nalin Dahyabhai for
pin pointing the cause of the crash.

http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217335

Modified Paths:
--------------
    trunk/libgaim/protocols/jabber/auth.c

Modified: trunk/libgaim/protocols/jabber/auth.c
===================================================================
--- trunk/libgaim/protocols/jabber/auth.c	2006-11-28 06:37:12 UTC (rev 17833)
+++ trunk/libgaim/protocols/jabber/auth.c	2006-11-28 06:59:48 UTC (rev 17834)
@@ -753,7 +753,9 @@
 	 * should try one more round against it
 	 */
 	if (js->sasl_state != SASL_OK) {
-		js->sasl_state = sasl_client_step(js->sasl, NULL, 0, NULL, NULL, NULL);
+		const char *c_out;
+		unsigned int clen;
+		js->sasl_state = sasl_client_step(js->sasl, NULL, 0, NULL, &c_out, &clen);
 		if (js->sasl_state != SASL_OK) {
 			/* This should never happen! */
 			gaim_connection_error(js->gc, _("Invalid response from server."));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17894] trunk/libgaim/protocols/jabber/auth.c

[<fac...@us...>]

Revision: 17894
          http://svn.sourceforge.net/gaim/?rev=17894&view=rev
Author:   faceprint
Date:     2006-12-04 04:52:18 -0800 (Mon, 04 Dec 2006)

Log Message:
-----------
hopefully fix the jabber crash people are seeing, and plug a small memory leak

Modified Paths:
--------------
    trunk/libgaim/protocols/jabber/auth.c

Modified: trunk/libgaim/protocols/jabber/auth.c
===================================================================
--- trunk/libgaim/protocols/jabber/auth.c	2006-12-04 11:36:31 UTC (rev 17893)
+++ trunk/libgaim/protocols/jabber/auth.c	2006-12-04 12:52:18 UTC (rev 17894)
@@ -716,6 +716,7 @@
 
 		js->sasl_state = sasl_client_step(js->sasl, (char*)dec_in, declen,
 						  NULL, &c_out, &clen);
+		g_free(enc_in);
 		g_free(dec_in);
 		if (js->sasl_state != SASL_CONTINUE && js->sasl_state != SASL_OK) {
 			gaim_debug_error("jabber", "Error is %d : %s\n",js->sasl_state,sasl_errdetail(js->sasl));
@@ -753,9 +754,20 @@
 	 * should try one more round against it
 	 */
 	if (js->sasl_state != SASL_OK) {
+		char *enc_in = xmlnode_get_data(packet);
+		unsigned char *dec_in = NULL;
 		const char *c_out;
 		unsigned int clen;
-		js->sasl_state = sasl_client_step(js->sasl, NULL, 0, NULL, &c_out, &clen);
+		gsize declen = 0;
+
+		if(enc_in != NULL)
+			dec_in = gaim_base64_decode(enc_in, &declen);
+
+		js->sasl_state = sasl_client_step(js->sasl, (char*)dec_in, declen, NULL, &c_out, &clen);
+
+		g_free(enc_in);
+		g_free(dec_in);
+
 		if (js->sasl_state != SASL_OK) {
 			/* This should never happen! */
 			gaim_connection_error(js->gc, _("Invalid response from server."));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17999] trunk/libgaim/protocols/jabber/auth.c

[<sea...@us...>]

Revision: 17999
          http://svn.sourceforge.net/gaim/?rev=17999&view=rev
Author:   seanegan
Date:     2006-12-14 14:25:18 -0800 (Thu, 14 Dec 2006)

Log Message:
-----------
Setting this namespaced attribute will tell the Google Talk servers that we can accept back a JID from the bind result that isn't necessarily related to the one we requested. This allows googlemail.com users to enter gmail.com as their server and still authenticate properly. Technically, we shouldn't need an attribute like this (this is all valid XMPP), but lesser clients might choke on this.

Modified Paths:
--------------
    trunk/libgaim/protocols/jabber/auth.c

Modified: trunk/libgaim/protocols/jabber/auth.c
===================================================================
--- trunk/libgaim/protocols/jabber/auth.c	2006-12-14 16:45:42 UTC (rev 17998)
+++ trunk/libgaim/protocols/jabber/auth.c	2006-12-14 22:25:18 UTC (rev 17999)
@@ -63,7 +63,10 @@
 
 		auth = xmlnode_new("auth");
 		xmlnode_set_namespace(auth, "urn:ietf:params:xml:ns:xmpp-sasl");
-
+		
+		xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth");
+		xmlnode_set_attrib(auth, "ga:client-users-full-bind-result", "true");
+		
 		response = g_string_new("");
 		response = g_string_append_len(response, "\0", 1);
 		response = g_string_append(response, js->user->node);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [18021] trunk/libgaim/protocols/jabber/auth.c

[<sea...@us...>]

Revision: 18021
          http://svn.sourceforge.net/gaim/?rev=18021&view=rev
Author:   seanegan
Date:     2006-12-18 12:29:45 -0800 (Mon, 18 Dec 2006)

Log Message:
-----------
typo

Modified Paths:
--------------
    trunk/libgaim/protocols/jabber/auth.c

Modified: trunk/libgaim/protocols/jabber/auth.c
===================================================================
--- trunk/libgaim/protocols/jabber/auth.c	2006-12-18 19:41:38 UTC (rev 18020)
+++ trunk/libgaim/protocols/jabber/auth.c	2006-12-18 20:29:45 UTC (rev 18021)
@@ -65,7 +65,7 @@
 		xmlnode_set_namespace(auth, "urn:ietf:params:xml:ns:xmpp-sasl");
 		
 		xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth");
-		xmlnode_set_attrib(auth, "ga:client-users-full-bind-result", "true");
+		xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true");
 		
 		response = g_string_new("");
 		response = g_string_append_len(response, "\0", 1);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.