Modified to use libtool's ltdl instead of gmodule

[openldap] / servers / slapd / search.c

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index ef38c6a59184692bdc719a91034ed82d1c89175f..e2ecd1ad10f75d887ec524e65bdcf9592d218d72 100644 (file)
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -157,20 +157,20 @@ do_search(
        Debug( LDAP_DEBUG_ARGS, "\n", 0, 0, 0 );
 
        Statslog( LDAP_DEBUG_STATS,
-           "conn=%d op=%d SRCH base=\"%s\" scope=%d filter=\"%s\"\n",
+           "conn=%ld op=%d SRCH base=\"%s\" scope=%d filter=\"%s\"\n",
            op->o_connid, op->o_opid, base, scope, fstr );
 
        if ( scope == LDAP_SCOPE_BASE ) {
 #if defined( SLAPD_MONITOR_DN )
                if ( strcmp( base, SLAPD_MONITOR_DN ) == 0 ) {
-                       monitor_info( conn, op );
+                       monitor_info( conn, op, attrs, attrsonly );
                        goto return_results;
                }
 #endif
 
 #if defined( SLAPD_CONFIG_DN )
                if ( strcmp( base, SLAPD_CONFIG_DN ) == 0 ) {
-                       config_info( conn, op );
+                       config_info( conn, op, attrs, attrsonly );
                        goto return_results;
                }
 #endif
@@ -200,6 +200,9 @@ do_search(
                goto return_results;
        }
 
+       /* deref the base if needed */
+       base = suffix_alias( be, base );
+
        /* actually do the search and send the result(s) */
        if ( be->be_search ) {
                (*be->be_search)( be, conn, op, base, scope, deref, sizelimit,