]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/result.c
allow proxying of dynamic objects (irrespective of the support provided to dynamic...
[openldap] / servers / slapd / result.c
index cb9e25ad7010cefb35d8cc36e86cef8c41814044..9384b591dcd095e23015407bb5f1fb239b8852f4 100644 (file)
@@ -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
@@ -286,6 +286,144 @@ send_ldap_controls( Operation *o, BerElement *ber, LDAPControl **c )
        return rc;
 }
 
+/*
+ * slap_response_play()
+ *
+ * plays the callback list; rationale: a callback can
+ *   - remove itself from the list, by setting op->o_callback = NULL;
+ *     malloc()'ed callbacks should free themselves from inside the
+ *     sc_response() function.
+ *   - replace itself with another (list of) callback(s), by setting
+ *     op->o_callback = a new (list of) callback(s); in this case, it
+ *     is the callback's responsibility to to append existing subsequent
+ *     callbacks to the end of the list that is passed to the sc_response()
+ *     function.
+ *   - modify the list of subsequent callbacks by modifying the value
+ *     of the sc_next field from inside the sc_response() function; this
+ *     case does not require any handling from inside slap_response_play()
+ *
+ * To stop execution of the playlist, the sc_response() function must return
+ * a value different from SLAP_SC_CONTINUE.
+ *
+ * The same applies to slap_cleanup_play(); only, there is no means to stop
+ * execution of the playlist, since all cleanup functions must be called.
+ */
+static int
+slap_response_play(
+       Operation *op,
+       SlapReply *rs )
+{
+       int rc;
+
+#ifdef NEW_CB
+       slap_callback   *sc = op->o_callback, **scp;
+
+       rc = SLAP_CB_CONTINUE;
+       for ( scp = &sc; *scp; ) {
+               slap_callback *sc_next = (*scp)->sc_next, **sc_nextp = &(*scp)->sc_next;
+
+               op->o_callback = *scp;
+               if ( op->o_callback->sc_response ) {
+                       rc = op->o_callback->sc_response( op, rs );
+                       if ( op->o_callback == NULL ) {
+                               /* the callback has been removed;
+                                * repair the list */
+                               *scp = sc_next;
+                               sc_nextp = scp;
+
+                       } else if ( op->o_callback != *scp ) {
+                               /* a new callback has been inserted
+                                * in place of the existing one; repair the list */
+                               *scp = op->o_callback;
+                               sc_nextp = scp;
+                       }
+                       if ( rc != SLAP_CB_CONTINUE ) break;
+               }
+               scp = sc_nextp;
+       }
+
+       op->o_callback = sc;
+#else /* ! NEW_CB */
+       slap_callback   *sc = op->o_callback, **sc_prev = &sc, *sc_next;
+
+       rc = SLAP_CB_CONTINUE;
+       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 != 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;
+       }
+
+       op->o_callback = sc;
+#endif /* ! NEW_CB */
+
+       return rc;
+}
+
+static int
+slap_cleanup_play(
+       Operation *op,
+       SlapReply *rs )
+{
+#ifdef NEW_CB
+       slap_callback   *sc = op->o_callback, **scp;
+
+       for ( scp = &sc; *scp; ) {
+               slap_callback *sc_next = (*scp)->sc_next, **sc_nextp = &(*scp)->sc_next;
+
+               op->o_callback = *scp;
+               if ( op->o_callback->sc_cleanup ) {
+                       (void)op->o_callback->sc_cleanup( op, rs );
+                       if ( op->o_callback == NULL ) {
+                               /* the callback has been removed;
+                                * repair the list */
+                               *scp = sc_next;
+                               sc_nextp = scp;
+
+                       } else if ( op->o_callback != *scp ) {
+                               /* a new callback has been inserted
+                                * after the existing one; repair the list */
+                               /* a new callback has been inserted
+                                * in place of the existing one; repair the list */
+                               *scp = op->o_callback;
+                               sc_nextp = scp;
+                       }
+                       /* don't care about the result; do all cleanup */
+               }
+               scp = sc_nextp;
+       }
+
+       op->o_callback = sc;
+#else /* ! NEW_CB */
+       slap_callback   *sc = op->o_callback, **sc_prev = &sc, *sc_next;
+
+       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 != sc2 ) {
+                               *sc_prev = op->o_callback;
+                       }
+                       if ( !op->o_callback ) break;
+                       if ( op->o_callback != sc2 ) continue;
+               }
+               sc_prev = &op->o_callback->sc_next;
+       }
+
+       op->o_callback = sc;
+#endif /* ! NEW_CB */
+
+       return LDAP_SUCCESS;
+}
+
 static int
 send_ldap_response(
        Operation *op,
@@ -302,23 +440,10 @@ send_ldap_response(
        }
 
        if ( op->o_callback ) {
-               slap_callback   *sc = op->o_callback, **sc_prev = &sc, *sc_next;
-
-               rc = SLAP_CB_CONTINUE;
-               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 ) {
-                               rc = op->o_callback->sc_response( op, rs );
-                               if ( op->o_callback != *sc_prev ) {
-                                       *sc_prev = op->o_callback;
-                               }
-                               if ( rc != SLAP_CB_CONTINUE || !op->o_callback ) break;
-                       }
-                       sc_prev = &op->o_callback->sc_next;
+               rc = slap_response_play( op, rs );
+               if ( rc != SLAP_CB_CONTINUE ) {
+                       goto clean2;
                }
-
-               op->o_callback = sc;
-               if ( rc != SLAP_CB_CONTINUE ) goto clean2;
        }
 
 #ifdef LDAP_CONNECTIONLESS
@@ -456,23 +581,9 @@ cleanup:;
 
 clean2:;
        if ( op->o_callback ) {
-               slap_callback   *sc = op->o_callback, **sc_prev = &sc, *sc_next;
-
-               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 ) {
-                               (void)op->o_callback->sc_cleanup( op, rs );
-                               if ( op->o_callback != *sc_prev ) {
-                                       *sc_prev = op->o_callback;
-                               }
-                               if ( !op->o_callback ) break;
-                       }
-                       sc_prev = &op->o_callback->sc_next;
-               }
-               op->o_callback = sc;
+               (void)slap_cleanup_play( op, rs );
        }
 
-
        if ( rs->sr_matched && rs->sr_flags & REP_MATCHED_MUSTBEFREED ) {
                free( (char *)rs->sr_matched );
                rs->sr_matched = NULL;
@@ -557,11 +668,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 ) {
@@ -662,13 +770,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;
@@ -680,7 +798,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
@@ -689,7 +811,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
        /* NOTE: moved before overlays callback circling because
         * they may modify entry and other stuff in rs */
        /* check for special all operational attributes ("+") type */
-       /* FIXME: maybe we could se this flag at the operation level;
+       /* FIXME: maybe we could set this flag at the operation level;
         * however, in principle the caller of send_search_entry() may
         * change the attribute list at each call */
        rs->sr_attr_flags = slap_attr_flags( rs->sr_attrs );
@@ -700,24 +822,10 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
        }
 
        if ( op->o_callback ) {
-               slap_callback   *sc = op->o_callback, **sc_prev = &sc, *sc_next;
-
-               rc = SLAP_CB_CONTINUE;
-               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 ) {
-                               rc = op->o_callback->sc_response( op, rs );
-                               if ( op->o_callback != *sc_prev ) {
-                                       *sc_prev = op->o_callback;
-                               }
-                               if ( rc != SLAP_CB_CONTINUE || !op->o_callback ) break;
-                       }
-                       sc_prev = &op->o_callback->sc_next;
+               rc = slap_response_play( op, rs );
+               if ( rc != SLAP_CB_CONTINUE ) {
+                       goto error_return;
                }
-
-               op->o_callback = sc;
-               if ( rc != SLAP_CB_CONTINUE ) goto error_return;
        }
 
        Debug( LDAP_DEBUG_TRACE, "=> send_search_entry: conn %lu dn=\"%s\"%s\n",
@@ -731,7 +839,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;
        }
 
@@ -777,6 +885,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;
        }
 
@@ -824,6 +933,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;
                        }
                }
@@ -873,6 +983,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;
@@ -906,6 +1017,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;
                                        }
                                }
@@ -917,6 +1029,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;
                                }
                        }
@@ -929,6 +1042,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;
                }
        }
@@ -982,6 +1096,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;
                        }
                }
@@ -1031,6 +1146,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;
                }
 
@@ -1059,6 +1175,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;
                                }
                        }
@@ -1071,6 +1188,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;
                }
        }
@@ -1105,7 +1223,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;
        }
 
@@ -1124,7 +1242,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++;
@@ -1142,24 +1260,11 @@ 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 ) {
-               slap_callback   *sc = op->o_callback, **sc_prev = &sc, *sc_next;
-
-               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 ) {
-                               (void)op->o_callback->sc_cleanup( op, rs );
-                               if ( op->o_callback != *sc_prev ) {
-                                       *sc_prev = op->o_callback;
-                               }
-                               if ( !op->o_callback ) break;
-                       }
-                       sc_prev = &op->o_callback->sc_next;
-               }
-               op->o_callback = sc;
+               (void)slap_cleanup_play( op, rs );
        }
 
        if ( e_flags ) {
@@ -1203,23 +1308,10 @@ slap_send_search_reference( Operation *op, SlapReply *rs )
 
        rs->sr_type = REP_SEARCHREF;
        if ( op->o_callback ) {
-               slap_callback   *sc = op->o_callback, **sc_prev = &sc, *sc_next;
-
-               rc = SLAP_CB_CONTINUE;
-               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 ) {
-                               rc = op->o_callback->sc_response( op, rs );
-                               if ( op->o_callback != *sc_prev ) {
-                                       *sc_prev = op->o_callback;
-                               }
-                               if ( rc != SLAP_CB_CONTINUE || !op->o_callback ) break;
-                       }
-                       sc_prev = &op->o_callback->sc_next;
+               rc = slap_response_play( op, rs );
+               if ( rc != SLAP_CB_CONTINUE ) {
+                       goto rel;
                }
-
-               op->o_callback = sc;
-               if ( rc != SLAP_CB_CONTINUE ) goto rel;
        }
 
        Debug( LDAP_DEBUG_TRACE,
@@ -1247,7 +1339,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", 
@@ -1255,7 +1346,6 @@ slap_send_search_reference( Operation *op, SlapReply *rs )
                rc = 0;
                goto rel;
        }
-#endif
 
        if( rs->sr_ref == NULL ) {
                Debug( LDAP_DEBUG_ANY,
@@ -1347,20 +1437,7 @@ slap_send_search_reference( Operation *op, SlapReply *rs )
 
 rel:
        if ( op->o_callback ) {
-               slap_callback   *sc = op->o_callback, **sc_prev = &sc, *sc_next;
-
-               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 ) {
-                               (void)op->o_callback->sc_cleanup( op, rs );
-                               if ( op->o_callback != *sc_prev ) {
-                                       *sc_prev = op->o_callback;
-                               }
-                               if ( rc != SLAP_CB_CONTINUE || !op->o_callback ) break;
-                       }
-                       sc_prev = &op->o_callback->sc_next;
-               }
-               op->o_callback = sc;
+               (void)slap_cleanup_play( op, rs );
        }
 
        return rc;
@@ -1453,6 +1530,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;