Update copyright for next release

[openldap] / libraries / libldap / compare.c

diff --git a/libraries/libldap/compare.c b/libraries/libldap/compare.c
index 8d8fe249f14edb00ca9f0c4ece4f3fd028117eaf..d800b00194e050e80725f801a6d8203e6d0496e1 100644 (file)
--- a/libraries/libldap/compare.c
+++ b/libraries/libldap/compare.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -15,19 +15,6 @@
 /* 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:
- *     CompareRequest ::= SEQUENCE {
- *             entry   DistinguishedName,
- *             ava     SEQUENCE {
- *                     type    AttributeType,
- *                     value   AttributeValue
- *             }
- *     }
- */
 
 #include "portable.h"
 
@@ -40,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
@@ -65,11 +62,7 @@ ldap_compare_ext(
        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 ) );
@@ -160,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 ) );