ITS#4358

[openldap] / servers / slapd / result.c

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 52a67ea2f8cd9e59aeb7bc3beeeea10198b59fc5..c5e17337b577d8aa4cd6b12d27238228606b9e35 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -82,11 +82,7 @@ static char *v2ref( BerVarray ref, const char *text )
                }
        }
 
-       v2 = SLAP_MALLOC( len+i+sizeof("Referral:") );
-       if( v2 == NULL ) {
-               Debug( LDAP_DEBUG_ANY, "v2ref: SLAP_MALLOC failed", 0, 0, 0 );
-               return NULL;
-       }
+       v2 = ch_malloc( len+i+sizeof("Referral:") );
 
        if( text != NULL ) {
                strcpy(v2, text);
@@ -98,11 +94,7 @@ static char *v2ref( BerVarray ref, const char *text )
        len += sizeof("Referral:");
 
        for( i=0; ref[i].bv_val != NULL; i++ ) {
-               v2 = SLAP_REALLOC( v2, len + ref[i].bv_len + 1 );
-               if( v2 == NULL ) {
-                       Debug( LDAP_DEBUG_ANY, "v2ref: SLAP_MALLOC failed", 0, 0, 0 );
-                       return NULL;
-               }
+               v2 = ch_realloc( v2, len + ref[i].bv_len + 1 );
                v2[len-1] = '\n';
                AC_MEMCPY(&v2[len], ref[i].bv_val, ref[i].bv_len );
                len += ref[i].bv_len;
@@ -307,11 +299,13 @@ send_ldap_response(
                for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) {
                        sc_next = op->o_callback->sc_next;
                        if ( op->o_callback->sc_response ) {
+                               slap_callback *sc2 = op->o_callback;
                                rc = op->o_callback->sc_response( op, rs );
-                               if ( op->o_callback != *sc_prev ) {
+                               if ( op->o_callback != sc2 ) {
                                        *sc_prev = op->o_callback;
                                }
                                if ( rc != SLAP_CB_CONTINUE || !op->o_callback ) break;
+                               if ( op->o_callback != sc2 ) continue;
                        }
                        sc_prev = &op->o_callback->sc_next;
                }
@@ -460,11 +454,13 @@ clean2:;
                for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) {
                        sc_next = op->o_callback->sc_next;
                        if ( op->o_callback->sc_cleanup ) {
+                               slap_callback *sc2 = op->o_callback;
                                (void)op->o_callback->sc_cleanup( op, rs );
-                               if ( op->o_callback != *sc_prev ) {
+                               if ( op->o_callback != sc2 ) {
                                        *sc_prev = op->o_callback;
                                }
                                if ( !op->o_callback ) break;
+                               if ( op->o_callback != sc2 ) continue;
                        }
                        sc_prev = &op->o_callback->sc_next;
                }
@@ -556,11 +552,8 @@ slap_send_ldap_result( Operation *op, SlapReply *rs )
        assert( rs->sr_err != LDAP_PARTIAL_RESULTS );
 
        if ( rs->sr_err == LDAP_REFERRAL ) {
-#ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
-               if( op->o_domain_scope ) {
-                       rs->sr_ref = NULL;
-               }
-#endif
+               if( op->o_domain_scope ) rs->sr_ref = NULL;
+
                if( rs->sr_ref == NULL ) {
                        rs->sr_err = LDAP_NO_SUCH_OBJECT;
                } else if ( op->o_protocol < LDAP_VERSION3 ) {
@@ -661,13 +654,23 @@ slap_send_ldap_intermediate( Operation *op, SlapReply *rs )
        }
 }
 
+/*
+ * returns:
+ *
+ * LDAP_SUCCESS                        entry sent
+ * LDAP_OTHER                  entry not sent (other)
+ * LDAP_INSUFFICIENT_ACCESS    entry not sent (ACL)
+ * LDAP_UNAVAILABLE            entry not sent (connection closed)
+ * LDAP_SIZELIMIT_EXCEEDED     entry not sent (caller must send sizelimitExceeded)
+ */
+
 int
 slap_send_search_entry( Operation *op, SlapReply *rs )
 {
        BerElementBuffer berbuf;
        BerElement      *ber = (BerElement *) &berbuf;
        Attribute       *a;
-       int             i, j, rc=-1, bytes;
+       int             i, j, rc = LDAP_UNAVAILABLE, bytes;
        char            *edn;
        int             userattrs;
        AccessControlState acl_state = ACL_STATE_INIT;
@@ -679,7 +682,11 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
         * e_flags: array of a_flags
         */
        char **e_flags = NULL;
-       
+
+       if ( op->ors_slimit >= 0 && rs->sr_nentries >= op->ors_slimit ) {
+               return LDAP_SIZELIMIT_EXCEEDED;
+       }
+
        rs->sr_type = REP_SEARCH;
 
        /* eventually will loop through generated operational attribute types
@@ -706,11 +713,13 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                {
                        sc_next = op->o_callback->sc_next;
                        if ( op->o_callback->sc_response ) {
+                               slap_callback *sc2 = op->o_callback;
                                rc = op->o_callback->sc_response( op, rs );
-                               if ( op->o_callback != *sc_prev ) {
+                               if ( op->o_callback != sc2 ) {
                                        *sc_prev = op->o_callback;
                                }
                                if ( rc != SLAP_CB_CONTINUE || !op->o_callback ) break;
+                               if ( op->o_callback != sc2 ) continue;
                        }
                        sc_prev = &op->o_callback->sc_next;
                }
@@ -730,7 +739,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                        "send_search_entry: conn %lu access to entry (%s) not allowed\n", 
                        op->o_connid, rs->sr_entry->e_name.bv_val, 0 );
 
-               rc = 1;
+               rc = LDAP_INSUFFICIENT_ACCESS;
                goto error_return;
        }
 
@@ -776,6 +785,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
 
                if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                send_ldap_error( op, rs, LDAP_OTHER, "encoding DN error" );
+               rc = rs->sr_err;
                goto error_return;
        }
 
@@ -823,6 +833,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                                if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                                send_ldap_error( op, rs, LDAP_OTHER,
                                        "matched values filtering error" );
+                               rc = rs->sr_err;
                                goto error_return;
                        }
                }
@@ -872,6 +883,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                                if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                                send_ldap_error( op, rs, LDAP_OTHER,
                                        "encoding description error");
+                               rc = rs->sr_err;
                                goto error_return;
                        }
                        finish = 1;
@@ -905,6 +917,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                                                if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                                                send_ldap_error( op, rs, LDAP_OTHER,
                                                        "encoding description error");
+                                               rc = rs->sr_err;
                                                goto error_return;
                                        }
                                }
@@ -916,6 +929,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                                        if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                                        send_ldap_error( op, rs, LDAP_OTHER,
                                                "encoding values error" );
+                                       rc = rs->sr_err;
                                        goto error_return;
                                }
                        }
@@ -928,6 +942,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
 
                        if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                        send_ldap_error( op, rs, LDAP_OTHER, "encode end error" );
+                       rc = rs->sr_err;
                        goto error_return;
                }
        }
@@ -981,6 +996,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                                if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                                send_ldap_error( op, rs, LDAP_OTHER,
                                        "matched values filtering error" );
+                               rc = rs->sr_err;
                                goto error_return;
                        }
                }
@@ -1030,6 +1046,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                        if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                        send_ldap_error( op, rs, LDAP_OTHER,
                                "encoding description error" );
+                       rc = rs->sr_err;
                        goto error_return;
                }
 
@@ -1058,6 +1075,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                                        if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                                        send_ldap_error( op, rs, LDAP_OTHER,
                                                "encoding values error" );
+                                       rc = rs->sr_err;
                                        goto error_return;
                                }
                        }
@@ -1070,6 +1088,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
 
                        if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                        send_ldap_error( op, rs, LDAP_OTHER, "encode end error" );
+                       rc = rs->sr_err;
                        goto error_return;
                }
        }
@@ -1104,7 +1123,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
 
                if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                send_ldap_error( op, rs, LDAP_OTHER, "encode entry end error" );
-               rc = 1;
+               rc = rs->sr_err;
                goto error_return;
        }
 
@@ -1123,7 +1142,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                                "send_search_entry: conn %lu  ber write failed.\n", 
                                op->o_connid, 0, 0 );
 
-                       rc = -1;
+                       rc = LDAP_UNAVAILABLE;
                        goto error_return;
                }
                rs->sr_nentries++;
@@ -1141,7 +1160,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
        Debug( LDAP_DEBUG_TRACE,
                "<= send_search_entry: conn %lu exit.\n", op->o_connid, 0, 0 );
 
-       rc = 0;
+       rc = LDAP_SUCCESS;
 
 error_return:;
        if ( op->o_callback ) {
@@ -1150,11 +1169,13 @@ error_return:;
                for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) {
                        sc_next = op->o_callback->sc_next;
                        if ( op->o_callback->sc_cleanup ) {
+                               slap_callback *sc2 = op->o_callback;
                                (void)op->o_callback->sc_cleanup( op, rs );
-                               if ( op->o_callback != *sc_prev ) {
+                               if ( op->o_callback != sc2 ) {
                                        *sc_prev = op->o_callback;
                                }
                                if ( !op->o_callback ) break;
+                               if ( op->o_callback != sc2 ) continue;
                        }
                        sc_prev = &op->o_callback->sc_next;
                }
@@ -1208,11 +1229,13 @@ slap_send_search_reference( Operation *op, SlapReply *rs )
                for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) {
                        sc_next = op->o_callback->sc_next;
                        if ( op->o_callback->sc_response ) {
+                               slap_callback *sc2 = op->o_callback;
                                rc = op->o_callback->sc_response( op, rs );
-                               if ( op->o_callback != *sc_prev ) {
+                               if ( op->o_callback != sc2 ) {
                                        *sc_prev = op->o_callback;
                                }
                                if ( rc != SLAP_CB_CONTINUE || !op->o_callback ) break;
+                               if ( op->o_callback != sc2 ) continue;
                        }
                        sc_prev = &op->o_callback->sc_next;
                }
@@ -1246,7 +1269,6 @@ slap_send_search_reference( Operation *op, SlapReply *rs )
                goto rel;
        }
 
-#ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
        if( op->o_domain_scope ) {
                Debug( LDAP_DEBUG_ANY,
                        "send_search_reference: domainScope control in (%s)\n", 
@@ -1254,7 +1276,6 @@ slap_send_search_reference( Operation *op, SlapReply *rs )
                rc = 0;
                goto rel;
        }
-#endif
 
        if( rs->sr_ref == NULL ) {
                Debug( LDAP_DEBUG_ANY,
@@ -1351,11 +1372,13 @@ rel:
                for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) {
                        sc_next = op->o_callback->sc_next;
                        if ( op->o_callback->sc_cleanup ) {
+                               slap_callback *sc2 = op->o_callback;
                                (void)op->o_callback->sc_cleanup( op, rs );
-                               if ( op->o_callback != *sc_prev ) {
+                               if ( op->o_callback != sc2 ) {
                                        *sc_prev = op->o_callback;
                                }
                                if ( rc != SLAP_CB_CONTINUE || !op->o_callback ) break;
+                               if ( op->o_callback != sc2 ) continue;
                        }
                        sc_prev = &op->o_callback->sc_next;
                }
@@ -1397,9 +1420,43 @@ str2result(
                }
 
                if ( strncasecmp( s, "code", STRLENOF( "code" ) ) == 0 ) {
-                       if ( c != NULL ) {
-                               *code = atoi( c );
+                       char    *next = NULL;
+                       long    retcode;
+
+                       if ( c == NULL ) {
+                               Debug( LDAP_DEBUG_ANY, "str2result (%s) missing value\n",
+                                   s, 0, 0 );
+                               rc = -1;
+                               continue;
+                       }
+
+                       while ( isspace( (unsigned char) c[ 0 ] ) ) c++;
+                       if ( c[ 0 ] == '\0' ) {
+                               Debug( LDAP_DEBUG_ANY, "str2result (%s) missing or empty value\n",
+                                   s, 0, 0 );
+                               rc = -1;
+                               continue;
                        }
+
+                       retcode = strtol( c, &next, 10 );
+                       if ( next == NULL || next == c ) {
+                               Debug( LDAP_DEBUG_ANY, "str2result (%s) unable to parse value\n",
+                                   s, 0, 0 );
+                               rc = -1;
+                               continue;
+                       }
+
+                       while ( isspace( (unsigned char) next[ 0 ] ) ) next++;
+                       if ( next[ 0 ] != '\0' ) {
+                               Debug( LDAP_DEBUG_ANY, "str2result (%s) extra cruft after value\n",
+                                   s, 0, 0 );
+                               rc = -1;
+                               continue;
+                       }
+
+                       /* FIXME: what if it's larger that max int? */
+                       *code = (int)retcode;
+
                } else if ( strncasecmp( s, "matched", STRLENOF( "matched" ) ) == 0 ) {
                        if ( c != NULL ) {
                                *matched = c;
@@ -1451,6 +1508,7 @@ int slap_read_controls(
        myop.o_bd = NULL;
        myop.o_res_ber = ber;
        myop.o_callback = NULL;
+       myop.ors_slimit = 1;
 
        rc = slap_send_search_entry( &myop, rs );
        if( rc ) return rc;