Attachment 153394 Details for Bug 237731 – cvs diff sasl_io.c and the fix description

cvs diff sasl_io.c and the fix description

sasl_io.html (text/html), 7.72 KB, created by Noriko Hosoi on 2007-04-25 01:29:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-04-25 01:29:03 UTC

Size: 7.72 KB

patch

obsolete

><html>
><head>
><title>Re: Today&#39;s 3 accetance test failures</title>
><link rel="important stylesheet" href="chrome://messenger/skin/messageBody.css">
></head>
><body>
><!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
><html>
><head>
> <meta content="text/html;charset=ISO-8859-1" http-equiv="Content-Type">
></head>
><body bgcolor="#ffffff" text="#000000">
>The place where B1 (SLAPD_DISCONNECT_BAD_BER_TAG) is
>set and returned is in the function connection_read_operation.&nbsp; It
>calls connection_read_ldap_data and if 0 is returned, it considers the
>connection is already closed and it cleans up the resource and return
>CONN_DONE. 
> 
>&nbsp;&nbsp; 1684 int connection_read_operation(Connection *conn, Operation *op,
>ber_tag_t *tag, int *remaining_data) 
>&nbsp;&nbsp; 1685 { 
>&nbsp;&nbsp; [...] 
>&nbsp;&nbsp; 1734&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /* We make a non-blocking read call */ 
>&nbsp;&nbsp; 1735&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ret = connection_read_ldap_data(conn,&amp;err); 
>&nbsp;&nbsp; 1736&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if (ret &lt;= 0) { 
>&nbsp;&nbsp; 1737&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if (0 == ret) { 
>&nbsp;&nbsp; 1738&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /* Connection is closed */ 
>&nbsp;&nbsp; 1739&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; PR_Lock( conn-&gt;c_mutex ); 
>&nbsp;&nbsp; 1740&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
>disconnect_server_nomutex( conn, conn-&gt;c_connid, -1,
>SLAPD_DISCONNECT_BAD_BER_TAG, 0 ); 
>&nbsp;&nbsp; 1741&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; conn-&gt;c_gettingber = 0; 
>&nbsp;&nbsp; 1742&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; PR_Unlock( conn-&gt;c_mutex ); 
>&nbsp;&nbsp; 1743&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; signal_listner(); 
>&nbsp;&nbsp; 1744&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; return CONN_DONE; 
>&nbsp;&nbsp; 1745&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; } 
> 
>In connection_read_ldap_data, sasl_reciv_connection is called for the
>SASL auth case.&nbsp; In the function, if nothing is in the decrypted buffer
>(line 260 in the following snippet), it reads from the socket to fill
>in the encrypted_buffer.&nbsp; And if "sasl_io_finished_packet(sp)" is true,
>it thinks it read the enough size of encrypted data and decrypt it in
>the decrypted_buffer.&nbsp; But, if "sasl_io_finished_packet(sp)" is false,
>it does not do any further job, and since bytes_to_return is still 0,
>it returns 0.&nbsp; That is, if the sasl request is not read by one call of
>sasl_io_read_packet, it looks to me that the server misinterprets it
>with B1 and closes the connection. 
> 
>&nbsp;&nbsp;&nbsp; 249 sasl_recv_connection(Connection *c, char *buffer, size_t
>count,PRInt32 *err) 
>&nbsp;&nbsp;&nbsp; 250 { 
>&nbsp;&nbsp;&nbsp; 251&nbsp;&nbsp;&nbsp;&nbsp; int ret = 0; 
>&nbsp;&nbsp;&nbsp; 252&nbsp;&nbsp;&nbsp;&nbsp; size_t bytes_in_buffer = 0; 
>&nbsp;&nbsp;&nbsp; 253&nbsp;&nbsp;&nbsp;&nbsp; sasl_io_private *sp = c-&gt;c_sasl_io_private; 
>&nbsp;&nbsp;&nbsp; 254 
>&nbsp;&nbsp;&nbsp; 255&nbsp;&nbsp;&nbsp;&nbsp; *err = 0; 
>&nbsp;&nbsp;&nbsp; 256&nbsp;&nbsp;&nbsp;&nbsp; LDAPDebug( LDAP_DEBUG_CONNS, 
>&nbsp;&nbsp;&nbsp; 257&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; "sasl_recv_connection for connection %d\n",
>c-&gt;c_connid,&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0, 0 ); 
>&nbsp;&nbsp;&nbsp; 258&nbsp;&nbsp;&nbsp;&nbsp; /* Do we have decrypted data buffered from 'before' ? */ 
>&nbsp;&nbsp;&nbsp; 259&nbsp;&nbsp;&nbsp;&nbsp; bytes_in_buffer = sp-&gt;decrypted_buffer_count -
>sp-&gt;decrypted_buffer_offset; 
>&nbsp;&nbsp;&nbsp; 260&nbsp;&nbsp;&nbsp;&nbsp; if (0 == bytes_in_buffer) { 
>&nbsp;&nbsp;&nbsp; 261&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /* If there wasn't buffered decrypted data, we need to
>get some.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; .. */ 
>&nbsp;&nbsp;&nbsp; 277&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /* Are we there yet ? */ 
>&nbsp;&nbsp;&nbsp; 278&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if (sasl_io_finished_packet(sp)) { 
>&nbsp;&nbsp;&nbsp; 279&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; const char *output_buffer = NULL; 
>&nbsp;&nbsp;&nbsp; [...] 
>&nbsp;&nbsp;&nbsp; 301&nbsp;&nbsp;&nbsp;&nbsp; } 
>&nbsp;&nbsp;&nbsp; 302&nbsp;&nbsp;&nbsp;&nbsp; /* Finally, return data from the buffer to the caller */ 
>&nbsp;&nbsp;&nbsp; 303&nbsp;&nbsp;&nbsp;&nbsp; { 
>&nbsp;&nbsp;&nbsp; 304&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; size_t bytes_to_return = sp-&gt;decrypted_buffer_count
>- sp-&gt;decrypted_buffer_offset; 
> 
>&nbsp;&nbsp;&nbsp; This is sasl_io_finished_packet call: 
>&nbsp;&nbsp;&nbsp; 183 static int 
>&nbsp;&nbsp;&nbsp; 184 sasl_io_finished_packet(sasl_io_private *sp) 
>&nbsp;&nbsp;&nbsp; 185 { 
>&nbsp;&nbsp;&nbsp; 186&nbsp;&nbsp;&nbsp;&nbsp; return (sp-&gt;encrypted_buffer_count&nbsp; &amp;&amp;
>(sp-&gt;encrypted_buffer_offset&nbsp; == sp-&gt;encrypted_buffer_count) ); 
>&nbsp;&nbsp;&nbsp; 187 } 
>&nbsp;&nbsp;&nbsp; 188 
> 
>I haven't successfully reproduced it yet, so it may not be the exact
>cause of the original problem, but I think we should support this
>particular case...&nbsp; Here's my proposal.&nbsp;&nbsp; If it looks reasonable, I'm
>opening a bug for this problem. 
> 
>Index: sasl_io.c 
>=================================================================== 
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/sasl_io.c,v 
>retrieving revision 1.10 
>diff -t -w -U4 -r1.10 sasl_io.c 
>--- sasl_io.c&nbsp;&nbsp; 10 Nov 2006 23:45:40 -0000&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 1.10 
>+++ sasl_io.c&nbsp;&nbsp; 24 Apr 2007 01:34:08 -0000 
>@@ -269,14 +269,16 @@ 
>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; } 
>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /* We now have the packet length 
>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; * we now must read more data off the wire until we have the
>complete packet 
>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; */ 
>+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; do { 
>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ret = sasl_io_read_packet(c,err); 
>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if (0 == ret || -1 == ret) { 
>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; return ret; 
>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; } 
>-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /* Are we there yet ? */ 
>-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if (sasl_io_finished_packet(sp)) { 
>+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; } while (!sasl_io_finished_packet(sp)); 
>+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /* We are there. */ 
>+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; { 
>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; const char *output_buffer = NULL; 
>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; unsigned int output_length = 0; 
>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; LDAPDebug( LDAP_DEBUG_CONNS, 
>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; "sasl_recv_connection finished reading packet for
>connection %d\n", c-&gt;c_connid, 0, 0 ); 
> 
></body>
></html>
></body>
></html>

<html>
<head>
<title>Re: Today&#39;s 3 accetance test failures</title>
<link rel="important stylesheet" href="chrome://messenger/skin/messageBody.css">
</head>
<body>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
  <meta content="text/html;charset=ISO-8859-1" http-equiv="Content-Type">
</head>
<body bgcolor="#ffffff" text="#000000">
The place where B1 (SLAPD_DISCONNECT_BAD_BER_TAG) is
set and returned is in the function connection_read_operation.&nbsp; It
calls connection_read_ldap_data and if 0 is returned, it considers the
connection is already closed and it cleans up the resource and return
CONN_DONE.<br>
<br>
&nbsp;&nbsp; 1684 int connection_read_operation(Connection *conn, Operation *op,
ber_tag_t *tag, int *remaining_data)<br>
&nbsp;&nbsp; 1685 {<br>
&nbsp;&nbsp; [...]<br>
&nbsp;&nbsp; 1734&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /* We make a non-blocking read call */<br>
&nbsp;&nbsp; 1735&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ret = connection_read_ldap_data(conn,&amp;err);<br>
&nbsp;&nbsp; 1736&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if (ret &lt;= 0) {<br>
&nbsp;&nbsp; 1737&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if (0 == ret) {<br>
&nbsp;&nbsp; 1738&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /* Connection is closed */ <br>
&nbsp;&nbsp; 1739&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; PR_Lock( conn-&gt;c_mutex );<br>
&nbsp;&nbsp; <font color="#cc0000"><b>1740&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
disconnect_server_nomutex( conn, conn-&gt;c_connid, -1,
SLAPD_DISCONNECT_BAD_BER_TAG, 0 );</b></font><br>
&nbsp;&nbsp; 1741&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; conn-&gt;c_gettingber = 0;<br>
&nbsp;&nbsp; 1742&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; PR_Unlock( conn-&gt;c_mutex );<br>
&nbsp;&nbsp; 1743&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; signal_listner();<br>
&nbsp;&nbsp; 1744&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; return CONN_DONE;<br>
&nbsp;&nbsp; 1745&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }<br>
<br>
In connection_read_ldap_data, sasl_reciv_connection is called for the
SASL auth case.&nbsp; In the function, if nothing is in the decrypted buffer
(line 260 in the following snippet), it reads from the socket to fill
in the encrypted_buffer.&nbsp; And if "sasl_io_finished_packet(sp)" is true,
it thinks it read the enough size of encrypted data and decrypt it in
the decrypted_buffer.&nbsp; But, if "sasl_io_finished_packet(sp)" is false,
it does not do any further job, and since bytes_to_return is still 0,
it returns 0.&nbsp; That is, if the sasl request is not read by one call of
sasl_io_read_packet, it looks to me that the server misinterprets it
with B1 and closes the connection.<br>
<br>
&nbsp;&nbsp;&nbsp; 249 sasl_recv_connection(Connection *c, char *buffer, size_t
count,PRInt32 *err)<br>
&nbsp;&nbsp;&nbsp; 250 {<br>
&nbsp;&nbsp;&nbsp; 251&nbsp;&nbsp;&nbsp;&nbsp; int ret = 0;<br>
&nbsp;&nbsp;&nbsp; 252&nbsp;&nbsp;&nbsp;&nbsp; size_t bytes_in_buffer = 0;<br>
&nbsp;&nbsp;&nbsp; 253&nbsp;&nbsp;&nbsp;&nbsp; sasl_io_private *sp = c-&gt;c_sasl_io_private;<br>
&nbsp;&nbsp;&nbsp; 254<br>
&nbsp;&nbsp;&nbsp; 255&nbsp;&nbsp;&nbsp;&nbsp; *err = 0;<br>
&nbsp;&nbsp;&nbsp; 256&nbsp;&nbsp;&nbsp;&nbsp; LDAPDebug( LDAP_DEBUG_CONNS,<br>
&nbsp;&nbsp;&nbsp; 257&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; "sasl_recv_connection for connection %d\n",
c-&gt;c_connid,&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 0, 0 );<br>
&nbsp;&nbsp;&nbsp; 258&nbsp;&nbsp;&nbsp;&nbsp; /* Do we have decrypted data buffered from 'before' ? */<br>
&nbsp;&nbsp;&nbsp; 259&nbsp;&nbsp;&nbsp;&nbsp; bytes_in_buffer = sp-&gt;decrypted_buffer_count -
sp-&gt;decrypted_buffer_offset;<br>
&nbsp;&nbsp;&nbsp; 260&nbsp;&nbsp;&nbsp;&nbsp; if (0 == bytes_in_buffer) {<br>
&nbsp;&nbsp;&nbsp; 261&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /* If there wasn't buffered decrypted data, we need to
get some.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; .. */<br>
&nbsp;&nbsp;&nbsp; 277&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /* Are we there yet ? */<br>
&nbsp;&nbsp;&nbsp; 278&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if (sasl_io_finished_packet(sp)) {<br>
&nbsp;&nbsp;&nbsp; 279&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; const char *output_buffer = NULL;<br>
&nbsp;&nbsp;&nbsp; [...]<br>
&nbsp;&nbsp;&nbsp; 301&nbsp;&nbsp;&nbsp;&nbsp; }<br>
&nbsp;&nbsp;&nbsp; 302&nbsp;&nbsp;&nbsp;&nbsp; /* Finally, return data from the buffer to the caller */<br>
&nbsp;&nbsp;&nbsp; 303&nbsp;&nbsp;&nbsp;&nbsp; {<br>
&nbsp;&nbsp;&nbsp; 304&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; size_t bytes_to_return = sp-&gt;decrypted_buffer_count
- sp-&gt;decrypted_buffer_offset;<br>
<br>
&nbsp;&nbsp;&nbsp; This is sasl_io_finished_packet call:<br>
&nbsp;&nbsp;&nbsp; 183 static int<br>
&nbsp;&nbsp;&nbsp; 184 sasl_io_finished_packet(sasl_io_private *sp)<br>
&nbsp;&nbsp;&nbsp; 185 {<br>
&nbsp;&nbsp;&nbsp; 186&nbsp;&nbsp;&nbsp;&nbsp; return (sp-&gt;encrypted_buffer_count&nbsp; &amp;&amp;
(sp-&gt;encrypted_buffer_offset&nbsp; == sp-&gt;encrypted_buffer_count) );<br>
&nbsp;&nbsp;&nbsp; 187 }<br>
&nbsp;&nbsp;&nbsp; 188<br>
<br>
I haven't successfully reproduced it yet, so it may not be the exact
cause of the original problem, but I think we should support this
particular case...&nbsp; Here's my proposal.&nbsp;&nbsp; If it looks reasonable, I'm
opening a bug for this problem. <br>
<br>
Index: sasl_io.c<br>
===================================================================<br>
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/sasl_io.c,v<br>
retrieving revision 1.10<br>
diff -t -w -U4 -r1.10 sasl_io.c<br>
--- sasl_io.c&nbsp;&nbsp; 10 Nov 2006 23:45:40 -0000&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 1.10<br>
+++ sasl_io.c&nbsp;&nbsp; 24 Apr 2007 01:34:08 -0000<br>
@@ -269,14 +269,16 @@<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /* We now have the packet length<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; * we now must read more data off the wire until we have the
complete packet<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; */<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; do {<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ret = sasl_io_read_packet(c,err);<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if (0 == ret || -1 == ret) {<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; return ret;<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /* Are we there yet ? */<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if (sasl_io_finished_packet(sp)) {<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; } while (!sasl_io_finished_packet(sp));<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /* We are there. */<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; const char *output_buffer = NULL;<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; unsigned int output_length = 0;<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; LDAPDebug( LDAP_DEBUG_CONNS,<br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; "sasl_recv_connection finished reading packet for
connection %d\n", c-&gt;c_connid, 0, 0 );<br>
<br>
</body>
</html>
</body>
</html>

Actions: View

Attachments on bug 237731: 153394 | 153451 | 153651 | 154692