More cleanup in ldap_pvt_tls_destroy()

[openldap] / libraries / libldap / compare.c

diff --git a/libraries/libldap/compare.c b/libraries/libldap/compare.c
index 767581a6efbbb5a083d61d004f03e61bbbe91164..fed841448365255b33b93f779db125fa74c574ec 100644 (file)
--- a/libraries/libldap/compare.c
+++ b/libraries/libldap/compare.c
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -35,7 +36,7 @@
  * attr and value) are supplied.  The msgid of the response is returned.
  *
  * Example:
- *     struct berval bvalue = { "secret", strlen("secret") };
+ *     struct berval bvalue = { "secret", sizeof("secret")-1 };
  *     rc = ldap_compare( ld, "c=us@cn=bob",
  *             "userPassword", &bvalue,
  *             sctrl, cctrl, &msgid )
@@ -50,6 +51,7 @@ ldap_compare_ext(
        LDAPControl **cctrls,
        int     *msgidp )
 {
+       int rc;
        BerElement      *ber;
 
        Debug( LDAP_DEBUG_TRACE, "ldap_compare\n", 0, 0, 0 );
@@ -60,14 +62,18 @@ ldap_compare_ext(
        assert( attr != NULL );
        assert( msgidp != NULL );
 
+       /* check client controls */
+       rc = ldap_int_client_controls( ld, cctrls );
+       if( rc != LDAP_SUCCESS ) return rc;
+
        /* create a message to send */
        if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
                return( LDAP_NO_MEMORY );
        }
 
-       if ( ber_printf( ber, "{it{s{sO}}", /* '}' */
+       if ( ber_printf( ber, "{it{s{sON}N}", /* '}' */
                ++ld->ld_msgid,
-               LDAP_REQ_COMPARE, dn, attr, &bvalue ) == -1 )
+               LDAP_REQ_COMPARE, dn, attr, bvalue ) == -1 )
        {
                ld->ld_errno = LDAP_ENCODING_ERROR;
                ber_free( ber, 1 );
@@ -80,7 +86,7 @@ ldap_compare_ext(
                return ld->ld_errno;
        }
 
-       if( ber_printf( ber, /*{*/ "}" ) == -1 ) {
+       if( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
                ld->ld_errno = LDAP_ENCODING_ERROR;
                ber_free( ber, 1 );
                return( ld->ld_errno );