Another minor filter fix (unescaped *)

[openldap] / libraries / libldap / cyrus.c

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index d262410e33dd55af97eefb49fba857fe8f58b3a1..8f3c5282da234ba942f481752cc161b44bcff066 100644 (file)
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -6,10 +6,10 @@
 
 #include "portable.h"
 
-#include <stdlib.h>
 #include <stdio.h>
 
 #include <ac/socket.h>
+#include <ac/stdlib.h>
 #include <ac/string.h>
 #include <ac/time.h>
 #include <ac/errno.h>
@@ -161,7 +161,7 @@ sb_sasl_drop_packet ( Sockbuf_Buf *sec_buf_in, int debuglevel )
 
        len = sec_buf_in->buf_ptr - sec_buf_in->buf_end;
        if ( len > 0 )
-               memmove( sec_buf_in->buf_base, sec_buf_in->buf_base +
+               AC_MEMCPY( sec_buf_in->buf_base, sec_buf_in->buf_base +
                        sec_buf_in->buf_end, len );
    
        if ( len >= 4 ) {
@@ -214,7 +214,7 @@ sb_sasl_read( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len)
                sbiod->sbiod_sb->sb_debug );
 
        /* Grow the packet buffer if neccessary */
-       if ( ( p->sec_buf_in.buf_size < ret ) && 
+       if ( ( p->sec_buf_in.buf_size < (ber_len_t) ret ) && 
                ber_pvt_sb_grow_buffer( &p->sec_buf_in, ret ) < 0 )
        {
                errno = ENOMEM;