Per ITS#419, don't require SLAPD_RLOOKUPS when HAVE_TCPD

[openldap] / servers / slapd / search.c

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 92a34841bf0914a9578c09fa80dd097a72a367a6..10e6d67b27601e43d908f32e34f1b7621eaf620d 100644 (file)
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
@@ -17,7 +18,7 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "ldap_defaults.h"
+#include "ldap_pvt.h"
 #include "slap.h"
 
 
@@ -30,7 +31,7 @@ do_search(
        int             i, err;
        ber_int_t               scope, deref, attrsonly;
        ber_int_t               sizelimit, timelimit;
-       char            *base = NULL, *fstr = NULL;
+       char            *base = NULL, *nbase = NULL, *fstr = NULL;
        Filter          *filter = NULL;
        char            **attrs = NULL;
        Backend         *be;
@@ -105,7 +106,14 @@ do_search(
                goto return_results;
        }
 
-       (void) dn_normalize_case( base );
+       nbase = ch_strdup( base );
+
+       if( dn_normalize( nbase ) == NULL ) {
+               send_ldap_result( conn, op, LDAP_INVALID_DN_SYNTAX,
+                       NULL, "invalid DN", NULL, NULL );
+               rc = -1;
+               goto return_results;
+       }
 
        Debug( LDAP_DEBUG_ARGS, "SRCH \"%s\" %d %d", base, scope, deref );
        Debug( LDAP_DEBUG_ARGS, "    %d %d %d\n", sizelimit, timelimit,
@@ -120,6 +128,7 @@ do_search(
                        send_ldap_result( conn, op, err,
                                NULL, "Bad search filter", NULL, NULL );
                }
+               rc = -1;
                goto return_results;
        }
 
@@ -152,32 +161,32 @@ 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 );
+               if ( strcmp( nbase, SLAPD_MONITOR_DN ) == 0 ) {
+                       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 );
+               if ( strcmp( nbase, SLAPD_CONFIG_DN ) == 0 ) {
+                       config_info( conn, op, attrs, attrsonly );
                        goto return_results;
                }
 #endif
 
 #if defined( SLAPD_SCHEMA_DN )
-               if ( strcmp( base, SLAPD_SCHEMA_DN ) == 0 ) {
+               if ( strcmp( nbase, SLAPD_SCHEMA_DN ) == 0 ) {
                        schema_info( conn, op, attrs, attrsonly );
                        goto return_results;
                }
 #endif
 
-               if ( strcmp( base, LDAP_ROOT_DSE ) == 0 ) {
+               if ( strcmp( nbase, LDAP_ROOT_DSE ) == 0 ) {
                        root_dse_info( conn, op, attrs, attrsonly );
                        goto return_results;
                }
@@ -188,16 +197,27 @@ do_search(
         * appropriate one, or send a referral to our "referral server"
         * if we don't hold it.
         */
-       if ( (be = select_backend( base )) == NULL ) {
+       if ( (be = select_backend( nbase )) == NULL ) {
                send_ldap_result( conn, op, rc = LDAP_REFERRAL,
                        NULL, NULL, default_referral, NULL );
 
                goto return_results;
        }
 
+       /* make sure this backend recongizes critical controls */
+       rc = backend_check_controls( be, conn, op ) ;
+
+       if( rc != LDAP_SUCCESS ) {
+               send_ldap_result( conn, op, rc,
+                       NULL, NULL, NULL, NULL );
+       }
+
+       /* deref the base if needed */
+       nbase = suffix_alias( be, nbase );
+
        /* actually do the search and send the result(s) */
        if ( be->be_search ) {
-               (*be->be_search)( be, conn, op, base, scope, deref, sizelimit,
+               (*be->be_search)( be, conn, op, base, nbase, scope, deref, sizelimit,
                    timelimit, filter, fstr, attrs, attrsonly );
        } else {
                send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
@@ -206,6 +226,7 @@ do_search(
 
 return_results:;
        if( base != NULL) free( base );
+       if( nbase != NULL) free( nbase );
        if( fstr != NULL) free( fstr );
        if( filter != NULL) filter_free( filter );
        if ( attrs != NULL ) {