/* $OpenLDAP$ */
/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/* Portions
*
* compare.c
*/
+/*
+ * 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 {
{
int rc;
BerElement *ber;
+ ber_int_t id;
#ifdef NEW_LOGGING
LDAP_LOG ( OPERATION, ENTRY, "ldap_compare\n", 0, 0, 0 );
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 );
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 );
}