actually, get_perms is needed by ldapi:// rgeardless of -DSLAP_X_LISTENER_MOD

[openldap] / servers / slapd / search.c

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index c4db3e52e664bb210845a9949a740ca3bc33b156..4699633403c4bc08a846577bab2b3e535aaefb2a 100644 (file)
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -45,8 +45,7 @@ do_search(
        int                     manageDSAit;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-               "do_search: conn %d\n", conn->c_connid ));
+       LDAP_LOG( OPERATION, ENTRY, "do_search: conn %d\n", conn->c_connid, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "do_search\n", 0, 0, 0 );
 #endif
@@ -112,9 +111,9 @@ do_search(
        rc = dnPrettyNormal( NULL, &base, &pbase, &nbase );
        if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+               LDAP_LOG( OPERATION, ERR, 
                        "do_search: conn %d  invalid dn (%s)\n",
-                       conn->c_connid, base.bv_val ));
+                       conn->c_connid, base.bv_val, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "do_search: invalid dn (%s)\n", base.bv_val, 0, 0 );
@@ -125,9 +124,10 @@ do_search(
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-               "do_search \"%s\" %d %d %d %d %d\n", base.bv_val, scope,
-               deref, sizelimit, timelimit, attrsonly ));
+       LDAP_LOG( OPERATION, ARGS, "SRCH \"%s\" %d %d",
+               base.bv_val, scope, deref );
+       LDAP_LOG( OPERATION, ARGS, "    %d %d %d\n",
+               sizelimit, timelimit, attrsonly);
 #else
        Debug( LDAP_DEBUG_ARGS, "SRCH \"%s\" %d %d",
                base.bv_val, scope, deref );
@@ -142,19 +142,17 @@ do_search(
                        send_ldap_disconnect( conn, op,
                                LDAP_PROTOCOL_ERROR, text );
                } else {
-                       send_ldap_result( conn, op, rc,
-                               NULL, text, NULL, NULL );
+                       send_ldap_result( conn, op, rc, 
+                                       NULL, text, NULL, NULL );
                }
                goto return_results;
-
-       } else {
-               filter2bv( filter, &fstr );
        }
+       filter2bv( filter, &fstr );
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-               "do_search: conn %d     filter: %s\n", conn->c_connid,
-               fstr.bv_len ? fstr.bv_val : "empty" ));
+       LDAP_LOG( OPERATION, ARGS, 
+               "do_search: conn %d     filter: %s\n", 
+               conn->c_connid, fstr.bv_len ? fstr.bv_val : "empty", 0 );
 #else
        Debug( LDAP_DEBUG_ARGS, "    filter: %s\n",
                fstr.bv_len ? fstr.bv_val : "empty", 0, 0 );
@@ -177,9 +175,9 @@ do_search(
 
        if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+               LDAP_LOG( OPERATION, INFO, 
                        "do_search: conn %d  get_ctrls failed (%d)\n",
-                       conn->c_connid, rc ));
+                       conn->c_connid, rc, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "do_search: get_ctrls failed\n", 0, 0, 0 );
 #endif
@@ -188,8 +186,8 @@ do_search(
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-               "do_search: conn %d     attrs:", conn->c_connid ));
+       LDAP_LOG( OPERATION, ARGS, 
+               "do_search: conn %d     attrs:", conn->c_connid, 0, 0 );
 #else
        Debug( LDAP_DEBUG_ARGS, "    attrs:", 0, 0, 0 );
 #endif
@@ -197,8 +195,8 @@ do_search(
        if ( siz != 0 ) {
                for ( i = 0; i<siz; i++ ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-                               "do_search:        %s", an[i].an_name.bv_val ));
+                       LDAP_LOG( OPERATION, ARGS, 
+                               "do_search: %s", an[i].an_name.bv_val, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_ARGS, " %s", an[i].an_name.bv_val, 0, 0 );
 #endif
@@ -206,7 +204,7 @@ do_search(
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_ARGS, "\n" ));
+       LDAP_LOG( OPERATION, ARGS, "\n" , 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_ARGS, "\n", 0, 0, 0 );
 #endif
@@ -236,10 +234,8 @@ do_search(
                        }
 
                        rc = root_dse_info( conn, &entry, &text );
-               }
 
-#if defined( SLAPD_SCHEMA_DN )
-               else if ( strcasecmp( nbase.bv_val, SLAPD_SCHEMA_DN ) == 0 ) {
+               } else if ( bvmatch( &nbase, &global_schemandn ) ) {
                        /* check restrictions */
                        rc = backend_check_restrictions( NULL, conn, op, NULL, &text ) ;
                        if( rc != LDAP_SUCCESS ) {
@@ -250,7 +246,6 @@ do_search(
 
                        rc = schema_info( &entry, &text );
                }
-#endif
 
                if( rc != LDAP_SUCCESS ) {
                        send_ldap_result( conn, op, rc,
@@ -319,7 +314,7 @@ do_search(
        if ( be->be_search ) {
                (*be->be_search)( be, conn, op, &pbase, &nbase,
                        scope, deref, sizelimit,
-                   timelimit, filter, &fstr, an, attrsonly );
+                       timelimit, filter, &fstr, an, attrsonly );
        } else {
                send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
                        NULL, "operation not supported within namingContext",
@@ -327,12 +322,17 @@ do_search(
        }
 
 return_results:;
-       if( pbase.bv_val != NULL) free( pbase.bv_val );
-       if( nbase.bv_val != NULL) free( nbase.bv_val );
+#ifdef LDAP_CLIENT_UPDATE
+       if ( !( op->o_clientupdate_type & SLAP_LCUP_PERSIST ) )
+#endif /* LDAP_CLIENT_UPDATE */
+       {
+               if( pbase.bv_val != NULL) free( pbase.bv_val );
+               if( nbase.bv_val != NULL) free( nbase.bv_val );
 
-       if( fstr.bv_val != NULL) free( fstr.bv_val );
-       if( filter != NULL) filter_free( filter );
-       if( an != NULL ) free( an );
+               if( fstr.bv_val != NULL) free( fstr.bv_val );
+               if( filter != NULL) filter_free( filter );
+               if( an != NULL ) free( an );
+       }
 
        return rc;
 }