Don't assert on null

[openldap] / libraries / libldap / compare.c

diff --git a/libraries/libldap/compare.c b/libraries/libldap/compare.c
index ab64d198652d84fc01419134159e3d1573711435..a48dda120f335884d2fe9494fac39122e6656991 100644 (file)
--- a/libraries/libldap/compare.c
+++ b/libraries/libldap/compare.c
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -9,6 +10,16 @@
  *  compare.c
  */
 
+/* The compare request looks like this:
+ *     CompareRequest ::= SEQUENCE {
+ *             entry   DistinguishedName,
+ *             ava     SEQUENCE {
+ *                     type    AttributeType,
+ *                     value   AttributeValue
+ *             }
+ *     }
+ */
+
 #include "portable.h"
 
 #include <stdio.h>
@@ -20,41 +31,60 @@
 #include "ldap-int.h"
 
 /*
- * ldap_compare - perform an ldap (and X.500) compare operation.  The dn
+ * 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
  * attr and value) are supplied.  The msgid of the response is returned.
  *
  * Example:
- *     ldap_compare( ld, "c=us@cn=bob", "userPassword", "secret" )
+ *     struct berval bvalue = { "secret", strlen("secret") };
+ *     rc = ldap_compare( ld, "c=us@cn=bob",
+ *             "userPassword", &bvalue,
+ *             sctrl, cctrl, &msgid )
  */
 int
-ldap_compare( LDAP *ld, char *dn, char *attr, char *value )
+ldap_compare_ext(
+       LDAP *ld,
+       LDAP_CONST char *dn,
+       LDAP_CONST char *attr,
+       struct berval *bvalue,
+       LDAPControl **sctrls,
+       LDAPControl **cctrls,
+       int     *msgidp )
 {
        BerElement      *ber;
 
-       /* The compare request looks like this:
-        *      CompareRequest ::= SEQUENCE {
-        *              entry   DistinguishedName,
-        *              ava     SEQUENCE {
-        *                      type    AttributeType,
-        *                      value   AttributeValue
-        *              }
-        *      }
-        * and must be wrapped in an LDAPMessage.
-        */
-
        Debug( LDAP_DEBUG_TRACE, "ldap_compare\n", 0, 0, 0 );
 
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
+       assert( dn != NULL );
+       assert( attr != NULL );
+       assert( msgidp != NULL );
+
        /* create a message to send */
-       if ( (ber = ldap_alloc_ber_with_options( ld )) == NULLBER ) {
-               return( -1 );
+       if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
+               return( LDAP_NO_MEMORY );
        }
 
-       if ( ber_printf( ber, "{it{s{ss}}}", ++ld->ld_msgid, LDAP_REQ_COMPARE,
-           dn, attr, value ) == -1 ) {
+       if ( ber_printf( ber, "{it{s{sON}N}", /* '}' */
+               ++ld->ld_msgid,
+               LDAP_REQ_COMPARE, dn, attr, bvalue ) == -1 )
+       {
                ld->ld_errno = LDAP_ENCODING_ERROR;
                ber_free( ber, 1 );
-               return( -1 );
+               return( ld->ld_errno );
+       }
+
+       /* Put Server Controls */
+       if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
+               ber_free( ber, 1 );
+               return ld->ld_errno;
+       }
+
+       if( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
+               ld->ld_errno = LDAP_ENCODING_ERROR;
+               ber_free( ber, 1 );
+               return( ld->ld_errno );
        }
 
 #ifndef LDAP_NOCACHE
@@ -62,27 +92,78 @@ ldap_compare( LDAP *ld, char *dn, char *attr, char *value )
                if ( ldap_check_cache( ld, LDAP_REQ_COMPARE, ber ) == 0 ) {
                        ber_free( ber, 1 );
                        ld->ld_errno = LDAP_SUCCESS;
-                       return( ld->ld_msgid );
+                       *msgidp = ld->ld_msgid;
+                       return( ld->ld_errno );
                }
                ldap_add_request_to_cache( ld, LDAP_REQ_COMPARE, ber );
        }
 #endif /* LDAP_NOCACHE */
 
        /* send the message */
-       return ( ldap_send_initial_request( ld, LDAP_REQ_COMPARE, dn, ber ));
+       *msgidp = ldap_send_initial_request( ld, LDAP_REQ_COMPARE, dn, ber );
+       return ( *msgidp < 0 ? ld->ld_errno : LDAP_SUCCESS );
+}
+
+/*
+ * 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
+ * attr and value) are supplied.  The msgid of the response is returned.
+ *
+ * Example:
+ *     msgid = ldap_compare( ld, "c=us@cn=bob", "userPassword", "secret" )
+ */
+int
+ldap_compare(
+       LDAP *ld,
+       LDAP_CONST char *dn,
+       LDAP_CONST char *attr,
+       LDAP_CONST char *value )
+{
+       int msgid;
+       struct berval bvalue;
+
+       bvalue.bv_val = (char *) value;
+       bvalue.bv_len = (value == NULL) ? 0 : strlen( value );
+
+       return ldap_compare_ext( ld, dn, attr, &bvalue, NULL, NULL, &msgid ) == LDAP_SUCCESS
+               ? msgid : -1;
 }
 
 int
-ldap_compare_s( LDAP *ld, char *dn, char *attr, char *value )
+ldap_compare_ext_s(
+       LDAP *ld,
+       LDAP_CONST char *dn,
+       LDAP_CONST char *attr,
+       struct berval *bvalue,
+       LDAPControl **sctrl,
+       LDAPControl **cctrl )
 {
+       int             rc;
        int             msgid;
        LDAPMessage     *res;
 
-       if ( (msgid = ldap_compare( ld, dn, attr, value )) == -1 )
-               return( ld->ld_errno );
+       rc = ldap_compare_ext( ld, dn, attr, bvalue, sctrl, cctrl, &msgid );
+
+       if (  rc != LDAP_SUCCESS )
+               return( rc );
 
        if ( ldap_result( ld, msgid, 1, (struct timeval *) NULL, &res ) == -1 )
                return( ld->ld_errno );
 
        return( ldap_result2error( ld, res, 1 ) );
 }
+
+int
+ldap_compare_s(
+       LDAP *ld,
+       LDAP_CONST char *dn,
+       LDAP_CONST char *attr,
+       LDAP_CONST char *value )
+{
+       struct berval bvalue;
+
+       bvalue.bv_val = (char *) value;
+       bvalue.bv_len = (value == NULL) ? 0 : strlen( value );
+
+       return ldap_compare_ext_s( ld, dn, attr, &bvalue, NULL, NULL );
+}