Import fix for ITS#1181 from Mark Adamson @ CMU.edu

diff --git a/CHANGES b/CHANGES
index 1978fdf42b9d882a280e711da7558e45d0af26e8..4ab9635b14e7790c5b2bfd67e6534ff852284f40 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,7 @@ OpenLDAP 2.2.12 Engineering
        Fixed slapd first component bug (ITS#3118)
        Fixed slapd TOLOWER macro use bug (ITS#3115)
        Fixed slapd TLS context clash bug (ITS#3109)
+       Fixed libldap SASL buffering bug (ITS#1181)
        Build Environment
                Fixed liblber memory debug portability bug (ITS#3116)
                Fixed back-perl perl portability bug (ITS#2554,2946)

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index f80a4c33c591bc4a520ef69ca5920df9b64a9f6c..cb4a25c94bd44a3befc86090abcbab4e92db570f 100644 (file)
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -264,7 +264,8 @@ sb_sasl_read( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len)
 
        /* Read the length of the packet */
        while ( p->sec_buf_in.buf_ptr < 4 ) {
-               ret = LBER_SBIOD_READ_NEXT( sbiod, p->sec_buf_in.buf_base,
+               ret = LBER_SBIOD_READ_NEXT( sbiod, p->sec_buf_in.buf_base +
+                       p->sec_buf_in.buf_ptr,
                        4 - p->sec_buf_in.buf_ptr );
 #ifdef EINTR
                if ( ( ret < 0 ) && ( errno == EINTR ) )