rpms/gaim/FC-6 gaim-2.0.0beta5-cyrus-sasl-crash.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: wtogami

Update of /cvs/dist/rpms/gaim/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv27540

Modified Files:
	gaim-2.0.0beta5-cyrus-sasl-crash.patch 
Log Message:
correct patch


gaim-2.0.0beta5-cyrus-sasl-crash.patch:
 auth.c |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

Index: gaim-2.0.0beta5-cyrus-sasl-crash.patch
===================================================================
RCS file: /cvs/dist/rpms/gaim/FC-6/gaim-2.0.0beta5-cyrus-sasl-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gaim-2.0.0beta5-cyrus-sasl-crash.patch	5 Dec 2006 19:59:23 -0000	1.1
+++ gaim-2.0.0beta5-cyrus-sasl-crash.patch	5 Dec 2006 20:26:58 -0000	1.2
@@ -1,4 +1,4 @@
-http://svn.sourceforge.net/viewvc/gaim/trunk/libgaim/protocols/jabber/auth.c?r1=17894&r2=17834&view=patch
+http://svn.sourceforge.net/viewvc/gaim/trunk/libgaim/protocols/jabber/auth.c?r1=17894&r2=17325&view=patch
 Revision 17894
 Modified Mon Dec 4 12:52:18 2006 UTC (30 hours, 47 minutes ago) by faceprint
 File length: 22396 byte(s)
@@ -24,7 +24,7 @@
 
 http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217335
 
---- trunk/libgaim/protocols/jabber/auth.c	2006/11/28 06:59:48	17834
+--- trunk/libgaim/protocols/jabber/auth.c	2006/09/19 23:46:17	17325
 +++ trunk/libgaim/protocols/jabber/auth.c	2006/12/04 12:52:18	17894
 @@ -716,6 +716,7 @@
  
@@ -43,15 +43,15 @@
  #endif
  
  	if(!ns || strcmp(ns, "urn:ietf:params:xml:ns:xmpp-sasl")) {
-@@ -753,18 +754,29 @@
+@@ -753,16 +754,29 @@
  	 * 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);
 +		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);
++		const char *c_out;
++		unsigned int clen;
 +		gsize declen = 0;
 +
 +		if(enc_in != NULL)