From b6bd7296ac2a6edc536d007fa175a5233155dd2c Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Wed, 30 Jun 2004 22:36:47 +0000 Subject: [PATCH] cleanup last commit, add commit --- libraries/libldap/cyrus.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c index 522068df8c..3eb8480845 100644 --- a/libraries/libldap/cyrus.c +++ b/libraries/libldap/cyrus.c @@ -352,7 +352,7 @@ sb_sasl_write( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len) /* Still have something left?? */ if ( p->buf_out.buf_ptr != p->buf_out.buf_end ) { errno = EAGAIN; - return 0; + return -1; } } @@ -384,11 +384,10 @@ sb_sasl_write( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len) p->buf_out.buf_end = p->buf_out.buf_size; ret = ber_pvt_sb_do_write( sbiod, &p->buf_out ); -#if 0 /* retry => re-sasl_encode, that would be bad */ - if ( ret <= 0 ) { - return ret; - } -#endif + + /* return number of bytes encoded, not written, to ensure + * no byte is encoded twice (even if only sent once). + */ return len; } -- 2.39.5