X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fresult.c;h=bb27c760f3638cbc3cd7872e5db45e9fea6d416d;hb=d1824b14ae78b128fb9ff6cf73d2ec4a0e756a90;hp=3e5c87f4869831e8a7581293f62051a071f93231;hpb=44e3b0b48172feecab989481d9fa7df866e9fa95;p=openldap diff --git a/servers/slapd/result.c b/servers/slapd/result.c index 3e5c87f486..bb27c760f3 100644 --- a/servers/slapd/result.c +++ b/servers/slapd/result.c @@ -36,7 +36,6 @@ #include #include "slap.h" -#include "lutil.h" const struct berval slap_dummy_bv = BER_BVNULL; @@ -83,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); @@ -99,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; @@ -175,7 +166,7 @@ static long send_ldap_ber( return 0; } - if ( ber_flush( conn->c_sb, ber, 0 ) == 0 ) { + if ( ber_flush2( conn->c_sb, ber, LBER_FLUSH_FREE_NEVER ) == 0 ) { break; } @@ -187,7 +178,7 @@ static long send_ldap_ber( * it's a hard error and return. */ - Debug( LDAP_DEBUG_CONNS, "ber_flush failed errno=%d reason=\"%s\"\n", + Debug( LDAP_DEBUG_CONNS, "ber_flush2 failed errno=%d reason=\"%s\"\n", err, sock_errstr(err), 0 ); if ( err != EWOULDBLOCK && err != EAGAIN ) { @@ -286,39 +277,64 @@ 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_loop( +slap_response_play( Operation *op, SlapReply *rs ) { int rc; -#ifdef NEW_CB - slap_callback *sc = op->o_callback, **sc_prev; +#ifdef LDAP_DEVEL + slap_callback *sc = op->o_callback, **scp; rc = SLAP_CB_CONTINUE; - for ( sc_prev = ≻ *sc_prev; ) { - slap_callback **sc_next = &(*sc_prev)->sc_next; + for ( scp = ≻ *scp; ) { + slap_callback *sc_next = (*scp)->sc_next, **sc_nextp = &(*scp)->sc_next; - op->o_callback = *sc_prev; + 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 */ - *sc_prev = *sc_next; - - } else if ( op->o_callback != *sc_prev ) { - /* a new callback has been inserted; repair the list */ - *sc_next = op->o_callback; - sc_next = &op->o_callback; + /* 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; } - sc_prev = sc_next; + scp = sc_nextp; } op->o_callback = sc; -#else /* ! NEW_CB */ +#else /* ! LDAP_DEVEL */ slap_callback *sc = op->o_callback, **sc_prev = &sc, *sc_next; rc = SLAP_CB_CONTINUE; @@ -337,41 +353,46 @@ slap_response_loop( } op->o_callback = sc; -#endif /* ! NEW_CB */ +#endif /* ! LDAP_DEVEL */ return rc; } static int -slap_cleanup_loop( +slap_cleanup_play( Operation *op, SlapReply *rs ) { -#ifdef NEW_CB - slap_callback *sc = op->o_callback, **sc_prev; +#ifdef LDAP_DEVEL + slap_callback *sc = op->o_callback, **scp; - for ( sc_prev = ≻ *sc_prev; ) { - slap_callback **sc_next = &(*sc_prev)->sc_next; + for ( scp = ≻ *scp; ) { + slap_callback *sc_next = (*scp)->sc_next, **sc_nextp = &(*scp)->sc_next; - op->o_callback = *sc_prev; + 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 */ - *sc_prev = *sc_next; - - } else if ( op->o_callback != *sc_prev ) { - /* a new callback has been inserted; repair the list */ - *sc_next = op->o_callback; - sc_next = &op->o_callback; + /* 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 */ } - sc_prev = sc_next; + scp = sc_nextp; } op->o_callback = sc; -#else /* ! NEW_CB */ +#else /* ! LDAP_DEVEL */ slap_callback *sc = op->o_callback, **sc_prev = &sc, *sc_next; for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) { @@ -389,7 +410,7 @@ slap_cleanup_loop( } op->o_callback = sc; -#endif /* ! NEW_CB */ +#endif /* ! LDAP_DEVEL */ return LDAP_SUCCESS; } @@ -404,13 +425,13 @@ send_ldap_response( int rc = LDAP_SUCCESS; long bytes; - if ( rs->sr_err == SLAPD_ABANDON ) { + if ( rs->sr_err == SLAPD_ABANDON || op->o_abandon ) { rc = SLAPD_ABANDON; goto clean2; } if ( op->o_callback ) { - rc = slap_response_loop( op, rs ); + rc = slap_response_play( op, rs ); if ( rc != SLAP_CB_CONTINUE ) { goto clean2; } @@ -551,7 +572,7 @@ cleanup:; clean2:; if ( op->o_callback ) { - (void)slap_cleanup_loop( op, rs ); + (void)slap_cleanup_play( op, rs ); } if ( rs->sr_matched && rs->sr_flags & REP_MATCHED_MUSTBEFREED ) { @@ -613,7 +634,7 @@ slap_send_ldap_result( Operation *op, SlapReply *rs ) rs->sr_type = REP_RESULT; /* Propagate Abandons so that cleanup callbacks can be processed */ - if ( rs->sr_err == SLAPD_ABANDON ) + if ( rs->sr_err == SLAPD_ABANDON || op->o_abandon ) goto abandon; assert( !LDAP_API_ERROR( rs->sr_err ) ); @@ -792,7 +813,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) } if ( op->o_callback ) { - rc = slap_response_loop( op, rs ); + rc = slap_response_play( op, rs ); if ( rc != SLAP_CB_CONTINUE ) { goto error_return; } @@ -1234,7 +1255,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) error_return:; if ( op->o_callback ) { - (void)slap_cleanup_loop( op, rs ); + (void)slap_cleanup_play( op, rs ); } if ( e_flags ) { @@ -1278,7 +1299,7 @@ slap_send_search_reference( Operation *op, SlapReply *rs ) rs->sr_type = REP_SEARCHREF; if ( op->o_callback ) { - rc = slap_response_loop( op, rs ); + rc = slap_response_play( op, rs ); if ( rc != SLAP_CB_CONTINUE ) { goto rel; } @@ -1407,7 +1428,7 @@ slap_send_search_reference( Operation *op, SlapReply *rs ) rel: if ( op->o_callback ) { - (void)slap_cleanup_loop( op, rs ); + (void)slap_cleanup_play( op, rs ); } return rc; @@ -1445,9 +1466,43 @@ str2result( } if ( strncasecmp( s, "code", STRLENOF( "code" ) ) == 0 ) { - if ( c != NULL && lutil_atoi( code, c ) != 0 ) { - goto bailout; + 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; @@ -1457,7 +1512,6 @@ str2result( *info = c; } } else { -bailout:; Debug( LDAP_DEBUG_ANY, "str2result (%s) unknown\n", s, 0, 0 );