Happy New Year!

[openldap] / libraries / libldap / compare.c

diff --git a/libraries/libldap/compare.c b/libraries/libldap/compare.c
index dc7fc839c9075ae9fc52c96e63639056156de324..70249ad1b03ddeda10dfbbf13586455a519aafc1 100644 (file)
--- a/libraries/libldap/compare.c
+++ b/libraries/libldap/compare.c
@@ -1,13 +1,22 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-/*  Portions
- *  Copyright (c) 1990 Regents of the University of Michigan.
- *  All rights reserved.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
  *
- *  compare.c
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
+ * All rights reserved.
+ */
+/* Portions Copyright (C) The Internet Society (1997)
+ * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
  */
 
 /* The compare request looks like this:
@@ -29,6 +38,7 @@
 #include <ac/time.h>
 
 #include "ldap-int.h"
+#include "ldap_log.h"
 
 /*
  * ldap_compare_ext - perform an ldap extended compare operation.  The dn
@@ -36,7 +46,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 )
@@ -51,7 +61,9 @@ ldap_compare_ext(
        LDAPControl **cctrls,
        int     *msgidp )
 {
+       int rc;
        BerElement      *ber;
+       ber_int_t       id;
 
        Debug( LDAP_DEBUG_TRACE, "ldap_compare\n", 0, 0, 0 );
 
@@ -61,14 +73,20 @@ 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}}", /* '}' */
-               ++ld->ld_msgid,
-               LDAP_REQ_COMPARE, dn, attr, bvalue ) == -1 )
+       LDAP_NEXT_MSGID(ld, id);
+       rc = ber_printf( ber, "{it{s{sON}N}", /* '}' */
+               id,
+               LDAP_REQ_COMPARE, dn, attr, bvalue );
+       if ( rc == -1 )
        {
                ld->ld_errno = LDAP_ENCODING_ERROR;
                ber_free( ber, 1 );
@@ -81,26 +99,15 @@ 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 );
        }
 
-#ifndef LDAP_NOCACHE
-       if ( ld->ld_cache != NULL ) {
-               if ( ldap_check_cache( ld, LDAP_REQ_COMPARE, ber ) == 0 ) {
-                       ber_free( ber, 1 );
-                       ld->ld_errno = LDAP_SUCCESS;
-                       *msgidp = ld->ld_msgid;
-                       return( ld->ld_errno );
-               }
-               ldap_add_request_to_cache( ld, LDAP_REQ_COMPARE, ber );
-       }
-#endif /* LDAP_NOCACHE */
 
        /* send the message */
-       *msgidp = ldap_send_initial_request( ld, LDAP_REQ_COMPARE, dn, ber );
+       *msgidp = ldap_send_initial_request( ld, LDAP_REQ_COMPARE, dn, ber, id );
        return ( *msgidp < 0 ? ld->ld_errno : LDAP_SUCCESS );
 }
 
@@ -122,6 +129,8 @@ ldap_compare(
        int msgid;
        struct berval bvalue;
 
+       assert( value != NULL );
+
        bvalue.bv_val = (char *) value;
        bvalue.bv_len = (value == NULL) ? 0 : strlen( value );
 
@@ -162,6 +171,8 @@ ldap_compare_s(
 {
        struct berval bvalue;
 
+       assert( value != NULL );
+
        bvalue.bv_val = (char *) value;
        bvalue.bv_len = (value == NULL) ? 0 : strlen( value );