release

[openldap] / libraries / libldap / compare.c

diff --git a/libraries/libldap/compare.c b/libraries/libldap/compare.c
index ce850217bcdc7a3374cf661ce6693b241856d8ce..bbfa2ca8b3c293ac012568568a936eacf144a13a 100644 (file)
--- a/libraries/libldap/compare.c
+++ b/libraries/libldap/compare.c
@@ -1,13 +1,22 @@
 /* $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-2006 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:
@@ -54,12 +63,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 +82,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 );
@@ -99,7 +107,7 @@ ldap_compare_ext(
 
 
        /* 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 );
 }