Fix idl_firstid to return NOID when !(nids > 1) instead of when (nids == 1)

[openldap] / servers / ldapd / search.c

diff --git a/servers/ldapd/search.c b/servers/ldapd/search.c
index 03d995c1c7c00d53fe61f81c434dbb8820390fa9..cd413856c48e0c17b1772bcbe71b6d287d89b75d 100644 (file)
--- a/servers/ldapd/search.c
+++ b/servers/ldapd/search.c
@@ -29,13 +29,11 @@
 #include "ldap.h"
 #include "common.h"
 
-static get_filter();
-static get_filter_list();
-static get_substring_filter();
+static int     get_filter( BerElement *ber, Filter *filt );
+static int     get_filter_list( BerElement *ber, Filter f );
+static int     get_substring_filter( BerElement *ber, Filter f );
 
 #ifdef LDAP_COMPAT
-extern int     version;
-extern int     ldap_compat;
 #define SEARCHRESTAG   (ldap_compat == 20 ? OLD_LDAP_RES_SEARCH_RESULT : LDAP_RES_SEARCH_RESULT)
 #else
 #define SEARCHRESTAG   LDAP_RES_SEARCH_RESULT
@@ -55,7 +53,6 @@ do_search(
        char                    **attrs;
        struct ds_search_arg    sa;
        static CommonArgs       common = default_common_args;
-       extern DN               ldap_str2dn();
 
        Debug( LDAP_DEBUG_TRACE, "do_search\n", 0, 0, 0 );
 
@@ -206,7 +203,8 @@ do_search(
        return( 1 );
 }
 
-static get_filter( BerElement *ber, Filter *filt )
+static int
+get_filter( BerElement *ber, Filter *filt )
 {
        unsigned long   tag, len;
        int             err;
@@ -375,7 +373,7 @@ static get_filter( BerElement *ber, Filter *filt )
                break;
 
        default:
-               Debug( LDAP_DEBUG_ANY, "unknown filter type %d\n", tag, 0, 0 );
+               Debug( LDAP_DEBUG_ANY, "unknown filter type %lu\n", tag, 0, 0 );
                free( f );
                return( LDAP_PROTOCOL_ERROR );
                break;
@@ -385,7 +383,8 @@ static get_filter( BerElement *ber, Filter *filt )
        return( err );
 }
 
-static get_filter_list( BerElement *ber, Filter f )
+static int
+get_filter_list( BerElement *ber, Filter f )
 {
        Filter          new, tail;
        int             err;
@@ -416,14 +415,14 @@ static get_filter_list( BerElement *ber, Filter f )
        return( 0 );
 }
 
-static get_substring_filter( BerElement *ber, Filter f )
+static int
+get_substring_filter( BerElement *ber, Filter f )
 {
        unsigned long   tag, len;
        char            typestr[64];
        AttributeType   type;
        char            *valstr, *last;
        AttributeValue  value;
-       extern short    ldap_dn_syntax;
 
        Debug( LDAP_DEBUG_TRACE, "get_substring_filter\n", 0, 0, 0 );