fix non-printable flag detection; improve dn test (passes all but last in http:/...

[openldap] / libraries / libldap / cyrus.c

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index 8f3c5282da234ba942f481752cc161b44bcff066..63eb7d1357cc207155ce66b5e29fbdeb759c75ff 100644 (file)
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1999-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1999-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -398,7 +398,7 @@ ldap_int_sasl_open(
        sasl_conn_t *ctx;
 
        sasl_callback_t *session_callbacks =
-               ber_memcalloc( 2, sizeof( sasl_callback_t ) );
+               LDAP_CALLOC( 2, sizeof( sasl_callback_t ) );
 
        if( session_callbacks == NULL ) return LDAP_NO_MEMORY;
 
@@ -419,7 +419,7 @@ ldap_int_sasl_open(
 
        rc = sasl_client_new( "ldap", host, session_callbacks,
                SASL_SECURITY_LAYER, &ctx );
-       ber_memfree( session_callbacks );
+       LDAP_FREE( session_callbacks );
 
        if ( rc != SASL_OK ) {
                ld->ld_errno = sasl_err2ldap( rc );