Update copyright for next release

[openldap] / libraries / libldap / compare.c

diff --git a/libraries/libldap/compare.c b/libraries/libldap/compare.c
index 009fcca2be55f57c8ef89cdeb5a902c00ac32732..d800b00194e050e80725f801a6d8203e6d0496e1 100644 (file)
--- a/libraries/libldap/compare.c
+++ b/libraries/libldap/compare.c
@@ -1,23 +1,19 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 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-2009 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>.
  */
-
-/* The compare request looks like this:
- *     CompareRequest ::= SEQUENCE {
- *             entry   DistinguishedName,
- *             ava     SEQUENCE {
- *                     type    AttributeType,
- *                     value   AttributeValue
- *             }
- *     }
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
+ * All rights reserved.
  */
 
 #include "portable.h"
@@ -31,6 +27,16 @@
 #include "ldap-int.h"
 #include "ldap_log.h"
 
+/* The compare request looks like this:
+ *     CompareRequest ::= SEQUENCE {
+ *             entry   DistinguishedName,
+ *             ava     SEQUENCE {
+ *                     type    AttributeType,
+ *                     value   AttributeValue
+ *             }
+ *     }
+ */
+
 /*
  * ldap_compare_ext - perform an ldap extended compare operation.  The dn
  * of the entry to compare to and the attribute and value to compare (in
@@ -54,12 +60,9 @@ ldap_compare_ext(
 {
        int rc;
        BerElement      *ber;
+       ber_int_t       id;
 
-#ifdef NEW_LOGGING
-       LDAP_LOG ( OPERATION, ENTRY, "ldap_compare\n", 0, 0, 0 );
-#else
        Debug( LDAP_DEBUG_TRACE, "ldap_compare\n", 0, 0, 0 );
-#endif
 
        assert( ld != NULL );
        assert( LDAP_VALID( ld ) );
@@ -76,9 +79,11 @@ ldap_compare_ext(
                return( LDAP_NO_MEMORY );
        }
 
-       if ( ber_printf( ber, "{it{s{sON}N}", /* '}' */
-               ++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 );
@@ -97,20 +102,9 @@ ldap_compare_ext(
                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 );
 }
 
@@ -159,7 +153,7 @@ ldap_compare_ext_s(
        if (  rc != LDAP_SUCCESS )
                return( rc );
 
-       if ( ldap_result( ld, msgid, 1, (struct timeval *) NULL, &res ) == -1 )
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 || !res )
                return( ld->ld_errno );
 
        return( ldap_result2error( ld, res, 1 ) );