s/exit(1)/exit(EXIT_FAILURE)/

[openldap] / libraries / libldap / search.c

diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c
index 61e8c3073356d9ca8d63281a6e2f22f27c1a4071..9d27820f93fa7114993c74e5a2d4165f3e0aab69 100644 (file)
--- a/libraries/libldap/search.c
+++ b/libraries/libldap/search.c
@@ -22,13 +22,31 @@
 
 #include "ldap-int.h"
 
-static char *find_right_paren LDAP_P(( char *s ));
-static char *put_complex_filter LDAP_P(( BerElement *ber, char *str,
-       unsigned long tag, int not ));
-static int put_filter LDAP_P(( BerElement *ber, char *str ));
-static int put_simple_filter LDAP_P(( BerElement *ber, char *str ));
-static int put_substring_filter LDAP_P(( BerElement *ber, char *type, char *str ));
-static int put_filter_list LDAP_P(( BerElement *ber, char *str ));
+static char *find_right_paren LDAP_P((
+       char *s ));
+
+static char *put_complex_filter LDAP_P((
+       BerElement *ber,
+       char *str,
+       ber_tag_t tag,
+       int not ));
+
+static int put_filter LDAP_P((
+       BerElement *ber,
+       char *str ));
+
+static int put_simple_filter LDAP_P((
+       BerElement *ber,
+       char *str ));
+
+static int put_substring_filter LDAP_P((
+       BerElement *ber,
+       char *type,
+       char *str ));
+
+static int put_filter_list LDAP_P((
+       BerElement *ber,
+       char *str ));
 
 /*
  * ldap_search_ext - initiate an ldap search operation.
@@ -74,13 +92,13 @@ ldap_search_ext(
         * otherwise, use default.
         */
        timelimit = (timeout != NULL)
-                       ?  timelimit = timeout->tv_sec
+                       ?  timeout->tv_sec
                        : -1;
 
        ber = ldap_build_search_req( ld, base, scope, filter, attrs,
            attrsonly, sctrls, cctrls, timelimit, sizelimit ); 
 
-       if ( ber == NULLBER ) {
+       if ( ber == NULL ) {
                return ld->ld_errno;
        }
 
@@ -166,7 +184,7 @@ ldap_search(
        ber = ldap_build_search_req( ld, base, scope, filter, attrs,
            attrsonly, NULL, NULL, -1, -1 ); 
 
-       if ( ber == NULLBER ) {
+       if ( ber == NULL ) {
                return( -1 );
        }
 
@@ -190,14 +208,14 @@ BerElement *
 ldap_build_search_req(
        LDAP *ld,
        LDAP_CONST char *base_in,
-       int scope,
+       ber_int_t scope,
        LDAP_CONST char *filter_in,
        char **attrs,
-       int attrsonly,
+       ber_int_t attrsonly,
        LDAPControl **sctrls,
        LDAPControl **cctrls,
-       int timelimit,
-       int sizelimit )
+       ber_int_t timelimit,
+       ber_int_t sizelimit )
 {
        BerElement      *ber;
        int             err;
@@ -229,8 +247,8 @@ ldap_build_search_req(
         */
 
        /* create a message to send */
-       if ( (ber = ldap_alloc_ber_with_options( ld )) == NULLBER ) {
-               return( NULLBER );
+       if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
+               return( NULL );
        }
 
        if ( base_in == NULL ) {
@@ -255,7 +273,7 @@ ldap_build_search_req(
        } else {
 #endif /* LDAP_CONNECTIONLESS */
                err = ber_printf( ber, "{it{seeiib", ++ld->ld_msgid,
-                   LDAP_REQ_SEARCH, base, scope, ld->ld_deref,
+                   LDAP_REQ_SEARCH, base, (ber_int_t) scope, ld->ld_deref,
                        (sizelimit < 0) ? ld->ld_sizelimit : sizelimit,
                        (timelimit < 0) ? ld->ld_timelimit : timelimit,
                    attrsonly );
@@ -266,7 +284,7 @@ ldap_build_search_req(
        if ( err == -1 ) {
                ld->ld_errno = LDAP_ENCODING_ERROR;
                ber_free( ber, 1 );
-               return( NULLBER );
+               return( NULL );
        }
 
        filter = LDAP_STRDUP( filter_in );
@@ -276,25 +294,25 @@ ldap_build_search_req(
        if ( err  == -1 ) {
                ld->ld_errno = LDAP_FILTER_ERROR;
                ber_free( ber, 1 );
-               return( NULLBER );
+               return( NULL );
        }
 
-       if ( ber_printf( ber, "{v}}", attrs ) == -1 ) {
+       if ( ber_printf( ber, /*{*/ "{v}}", attrs ) == -1 ) {
                ld->ld_errno = LDAP_ENCODING_ERROR;
                ber_free( ber, 1 );
-               return( NULLBER );
+               return( NULL );
        }
 
        /* Put Server Controls */
        if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
                ber_free( ber, 1 );
-               return( NULLBER );
+               return( NULL );
        }
 
-       if ( ber_printf( ber, "}", attrs ) == -1 ) {
+       if ( ber_printf( ber, /*{*/ "}", attrs ) == -1 ) {
                ld->ld_errno = LDAP_ENCODING_ERROR;
                ber_free( ber, 1 );
-               return( NULLBER );
+               return( NULL );
        }
 
        return( ber );
@@ -326,7 +344,7 @@ find_right_paren( char *s )
 }
 
 static char *
-put_complex_filter( BerElement *ber, char *str, unsigned long tag, int not )
+put_complex_filter( BerElement *ber, char *str, ber_tag_t tag, int not )
 {
        char    *next;
 
@@ -338,13 +356,8 @@ put_complex_filter( BerElement *ber, char *str, unsigned long tag, int not )
         */
 
        /* put explicit tag */
-       if ( ber_printf( ber, "t{", tag ) == -1 )
-               return( NULL );
-
-#if 0
-       if ( !not && ber_printf( ber, "{" ) == -1 )
+       if ( ber_printf( ber, "t{" /*}*/, tag ) == -1 )
                return( NULL );
-#endif
 
        str++;
        if ( (next = find_right_paren( str )) == NULL )
@@ -356,14 +369,9 @@ put_complex_filter( BerElement *ber, char *str, unsigned long tag, int not )
        *next++ = ')';
 
        /* flush explicit tagged thang */
-       if ( ber_printf( ber, "}" ) == -1 )
+       if ( ber_printf( ber, /*{*/ "}" ) == -1 )
                return( NULL );
 
-#if 0
-       if ( !not && ber_printf( ber, "}" ) == -1 )
-               return( NULL );
-#endif
-
        return( next );
 }
 
@@ -383,8 +391,9 @@ put_filter( BerElement *ber, char *str )
         *              substrings      [4]     SubstringFilter,
         *              greaterOrEqual  [5]     AttributeValueAssertion,
         *              lessOrEqual     [6]     AttributeValueAssertion,
-        *              present         [7]     AttributeType,,
-        *              approxMatch     [8]     AttributeValueAssertion
+        *              present         [7]     AttributeType,
+        *              approxMatch     [8]     AttributeValueAssertion,
+        *                              extensibleMatch [9]             MatchingRuleAssertion -- LDAPv3
         *      }
         *
         *      SubstringFilter ::= SEQUENCE {
@@ -395,6 +404,13 @@ put_filter( BerElement *ber, char *str )
         *                      final            [2] IA5String
         *              }
         *      }
+        *
+        *              MatchingRuleAssertion ::= SEQUENCE {    -- LDAPv3
+        *                      matchingRule    [1] MatchingRuleId OPTIONAL,
+        *                      type            [2] AttributeDescription OPTIONAL,
+        *                      matchValue      [3] AssertionValue,
+        *                      dnAttributes    [4] BOOLEAN DEFAULT FALSE }
+        *
         * Note: tags in a choice are always explicit
         */
 
@@ -493,7 +509,7 @@ put_filter( BerElement *ber, char *str )
                case ')':
                        Debug( LDAP_DEBUG_TRACE, "put_filter: end\n", 0, 0,
                            0 );
-                       if ( ber_printf( ber, "]" ) == -1 )
+                       if ( ber_printf( ber, /*[*/ "]" ) == -1 )
                                return( -1 );
                        str++;
                        parens--;
@@ -568,11 +584,13 @@ put_filter_list( BerElement *ber, char *str )
 }
 
 static int
-put_simple_filter( BerElement *ber, char *str )
+put_simple_filter(
+       BerElement *ber,
+       char *str )
 {
        char            *s;
        char            *value, savechar;
-       unsigned long   ftype;
+       ber_tag_t       ftype;
        int             rc;
 
        Debug( LDAP_DEBUG_TRACE, "put_simple_filter \"%s\"\n", str, 0, 0 );
@@ -596,6 +614,10 @@ put_simple_filter( BerElement *ber, char *str )
                ftype = LDAP_FILTER_APPROX;
                *s = '\0';
                break;
+       case ':':       /* LDAPv3 extended filter */
+               ftype = LDAP_FILTER_EXTENDED;
+               return -1;
+               break;
        default:
                if ( strchr( value, '*' ) == NULL ) {
                        ftype = LDAP_FILTER_EQUALITY;
@@ -624,12 +646,12 @@ static int
 put_substring_filter( BerElement *ber, char *type, char *val )
 {
        char            *nextstar, gotstar = 0;
-       unsigned long   ftype;
+       ber_tag_t       ftype = LDAP_FILTER_SUBSTRINGS;
 
        Debug( LDAP_DEBUG_TRACE, "put_substring_filter \"%s=%s\"\n", type,
            val, 0 );
 
-       if ( ber_printf( ber, "t{s{", LDAP_FILTER_SUBSTRINGS, type ) == -1 )
+       if ( ber_printf( ber, "t{s{", ftype, type ) == -1 )
                return( -1 );
 
        while ( val != NULL ) {
@@ -654,7 +676,7 @@ put_substring_filter( BerElement *ber, char *type, char *val )
                val = nextstar;
        }
 
-       if ( ber_printf( ber, "}}" ) == -1 )
+       if ( ber_printf( ber, /* {{ */ "}}" ) == -1 )
                return( -1 );
 
        return( 0 );