Fix up NT port after thread changes

[openldap] / libraries / libldap / sasl.c

diff --git a/libraries/libldap/sasl.c b/libraries/libldap/sasl.c
index e162b04a5389db52da14aee698485d26b9c82b47..1243454d76a92aaff48ebfa9714afb133f48c465 100644 (file)
--- a/libraries/libldap/sasl.c
+++ b/libraries/libldap/sasl.c
@@ -588,7 +588,7 @@ sb_sasl_read( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len)
 
        p->buf_in.buf_size = p->buf_in.buf_end;
 
-       bufptr += ber_pvt_sb_copy_out( &p->buf_in, buf + bufptr, len );
+       bufptr += ber_pvt_sb_copy_out( &p->buf_in, (char*) buf + bufptr, len );
 
        return bufptr;
 }
@@ -742,12 +742,12 @@ ldap_pvt_sasl_getmechs ( LDAP *ld, char **pmechlist )
        mechlist = array2str( values );
        if ( mechlist == NULL ) {
                ld->ld_errno = LDAP_NO_MEMORY;
-               ldap_value_free( values );
+               LDAP_VFREE( values );
                ldap_msgfree( res );
                return ld->ld_errno;
        } 
 
-       ldap_value_free( values );
+       LDAP_VFREE( values );
        ldap_msgfree( res );
 
        *pmechlist = mechlist;
@@ -835,7 +835,7 @@ ldap_pvt_sasl_bind(
        }
        sasl_setprop( ld->ld_sasl_context, SASL_IP_LOCAL, &sin );
 
-       memset( &secprops, 0, sizeof( secprops ) );
+       memset( &secprops, '\0', sizeof( secprops ) );
        secprops.min_ssf = ld->ld_options.ldo_sasl_minssf;
        secprops.max_ssf = ld->ld_options.ldo_sasl_maxssf;
        secprops.security_flags = SASL_SECURITY_LAYER;