modify be_referral to use struct berval DNs.

[openldap] / servers / slapd / back-ldbm / search.c

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index f4484ecf605b92a5088e5c06f736d2f30ce2d988..bc5e67989c27158f2550073f9d04359e05a0a6fc 100644 (file)
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -37,7 +37,7 @@ ldbm_back_search(
     int                tlimit,
     Filter     *filter,
     const char *filterstr,
-    char       **attrs,
+    struct berval      **attrs,
     int                attrsonly )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
@@ -206,15 +206,15 @@ searchit:
        }
 
        /* if not root, get appropriate limits */
-       if ( be_isroot( be, op->o_ndn ) ) {
+       if ( be_isroot( be, &op->o_ndn ) ) {
                isroot = 1;
        } else {
-               ( void ) get_limits( be, op->o_ndn, &limit );
+               ( void ) get_limits( be, &op->o_ndn, &limit );
        }
 
        /* if candidates exceed to-be-checked entries, abort */
        if ( !isroot && limit->lms_s_unchecked != -1 ) {
-               if ( ID_BLOCK_NIDS( candidates ) > limit->lms_s_unchecked ) {
+               if ( ID_BLOCK_NIDS( candidates ) > (unsigned) limit->lms_s_unchecked ) {
                        send_search_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
                                        NULL, NULL, NULL, NULL, 0 );
                        rc = 0;