X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foverlays%2Fdds.c;h=f8b2dab5140d297b194522eef4bb88ad68fdc426;hb=a255e44bf0fcb703a3a5ac58117fd54a00727fd1;hp=e55a6510c2f7f5ec6552250ae05998eca13aca61;hpb=20f2548c82e073b82733f18794d0bc0f5cfe5852;p=openldap diff --git a/servers/slapd/overlays/dds.c b/servers/slapd/overlays/dds.c index e55a6510c2..f8b2dab514 100644 --- a/servers/slapd/overlays/dds.c +++ b/servers/slapd/overlays/dds.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2005-2007 The OpenLDAP Foundation. + * Copyright 2005-2012 The OpenLDAP Foundation. * Portions Copyright 2005-2006 SysNet s.n.c. * All rights reserved. * @@ -137,7 +137,7 @@ dds_expire( void *ctx, dds_info_t *di ) int rc; char *extra = ""; - connection_fake_init( &conn, &opbuf, ctx ); + connection_fake_init2( &conn, &opbuf, ctx, 0 ); op = &opbuf.ob_op; op->o_tag = LDAP_REQ_SEARCH; @@ -156,7 +156,7 @@ dds_expire( void *ctx, dds_info_t *di ) op->ors_slimit = SLAP_NO_LIMIT; op->ors_attrs = slap_anlist_no_attrs; - expire = slap_get_time() + di->di_tolerance; + expire = slap_get_time() - di->di_tolerance; ts.bv_val = tsbuf; ts.bv_len = sizeof( tsbuf ); slap_timestamp( &expire, &ts ); @@ -185,7 +185,7 @@ dds_expire( void *ctx, dds_info_t *di ) done_search:; op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx ); - filter_free_x( op, op->ors_filter ); + filter_free_x( op, op->ors_filter, 1 ); rc = rs.sr_err; switch ( rs.sr_err ) { @@ -243,10 +243,9 @@ done_search:; de->de_ndn.bv_val, rs.sr_err ); break; } - + if ( de != NULL ) { *dep = de->de_next; - dep = &de->de_next; op->o_tmpfree( de, op->o_tmpmemctx ); } } @@ -582,11 +581,13 @@ dds_op_modify( Operation *op, SlapReply *rs ) } } else if ( mod->sml_desc == slap_schema.si_ad_entryTtl ) { - unsigned long ttl; + unsigned long uttl; + time_t ttl; int rc; switch ( mod->sml_op ) { case LDAP_MOD_DELETE: + case SLAP_MOD_SOFTDEL: /* FIXME? */ if ( mod->sml_values != NULL ) { if ( BER_BVISEMPTY( &bv_entryTtl ) || !bvmatch( &bv_entryTtl, &mod->sml_values[ 0 ] ) ) @@ -611,8 +612,9 @@ dds_op_modify( Operation *op, SlapReply *rs ) entryTtl = -1; /* fallthru */ - case SLAP_MOD_SOFTADD: /* FIXME? */ case LDAP_MOD_ADD: + case SLAP_MOD_SOFTADD: /* FIXME? */ + case SLAP_MOD_ADD_IF_NOT_PRESENT: /* FIXME? */ assert( mod->sml_values != NULL ); assert( BER_BVISNULL( &mod->sml_values[ 1 ] ) ); @@ -629,7 +631,8 @@ dds_op_modify( Operation *op, SlapReply *rs ) goto done; } - rc = lutil_atoul( &ttl, mod->sml_values[ 0 ].bv_val ); + rc = lutil_atoul( &uttl, mod->sml_values[ 0 ].bv_val ); + ttl = (time_t)uttl; assert( rc == 0 ); if ( ttl > DDS_RF2589_MAX_TTL ) { rs->sr_err = LDAP_PROTOCOL_ERROR; @@ -646,7 +649,7 @@ dds_op_modify( Operation *op, SlapReply *rs ) goto done; } - entryTtl = (time_t)ttl; + entryTtl = ttl; bv_entryTtl.bv_len = mod->sml_values[ 0 ].bv_len; AC_MEMCPY( bv_entryTtl.bv_val, mod->sml_values[ 0 ].bv_val, bv_entryTtl.bv_len ); bv_entryTtl.bv_val[ bv_entryTtl.bv_len ] = '\0'; @@ -1121,26 +1124,24 @@ dds_op_extended( Operation *op, SlapReply *rs ) BerElementBuffer berbuf; BerElement *ber = (BerElement *)&berbuf; - if ( rs->sr_err == LDAP_SUCCESS ) { - ber_init_w_nullc( ber, LBER_USE_DER ); + ber_init_w_nullc( ber, LBER_USE_DER ); - rc = ber_printf( ber, "{tiN}", LDAP_TAG_EXOP_REFRESH_RES_TTL, (int)ttl ); + rc = ber_printf( ber, "{tiN}", LDAP_TAG_EXOP_REFRESH_RES_TTL, (int)ttl ); - if ( rc < 0 ) { - rs->sr_err = LDAP_OTHER; - rs->sr_text = "internal error"; - - } else { - (void)ber_flatten( ber, &rs->sr_rspdata ); - rs->sr_rspoid = ch_strdup( slap_EXOP_REFRESH.bv_val ); + if ( rc < 0 ) { + rs->sr_err = LDAP_OTHER; + rs->sr_text = "internal error"; - Log3( LDAP_DEBUG_TRACE, LDAP_LEVEL_INFO, - "%s REFRESH dn=\"%s\" TTL=%ld\n", - op->o_log_prefix, op->o_req_ndn.bv_val, ttl ); - } + } else { + (void)ber_flatten( ber, &rs->sr_rspdata ); + rs->sr_rspoid = ch_strdup( slap_EXOP_REFRESH.bv_val ); - ber_free_buf( ber ); + Log3( LDAP_DEBUG_TRACE, LDAP_LEVEL_INFO, + "%s REFRESH dn=\"%s\" TTL=%ld\n", + op->o_log_prefix, op->o_req_ndn.bv_val, ttl ); } + + ber_free_buf( ber ); } return rs->sr_err; @@ -1391,7 +1392,7 @@ dds_cfgen( ConfigArgs *c ) if ( t < DDS_RF2589_DEFAULT_TTL || t > DDS_RF2589_MAX_TTL ) { snprintf( c->cr_msg, sizeof( c->cr_msg ), - "DDS invalid dds-max-ttl=%ld; must be between %d and %d", + "DDS invalid dds-max-ttl=%lu; must be between %d and %d", t, DDS_RF2589_DEFAULT_TTL, DDS_RF2589_MAX_TTL ); Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, "%s: %s.\n", c->log, c->cr_msg ); @@ -1411,9 +1412,9 @@ dds_cfgen( ConfigArgs *c ) return 1; } - if ( t < 0 || t > DDS_RF2589_MAX_TTL ) { + if ( t > DDS_RF2589_MAX_TTL ) { snprintf( c->cr_msg, sizeof( c->cr_msg ), - "DDS invalid dds-min-ttl=%ld", + "DDS invalid dds-min-ttl=%lu", t ); Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, "%s: %s.\n", c->log, c->cr_msg ); @@ -1438,9 +1439,9 @@ dds_cfgen( ConfigArgs *c ) return 1; } - if ( t < 0 || t > DDS_RF2589_MAX_TTL ) { + if ( t > DDS_RF2589_MAX_TTL ) { snprintf( c->cr_msg, sizeof( c->cr_msg ), - "DDS invalid dds-default-ttl=%ld", + "DDS invalid dds-default-ttl=%lu", t ); Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, "%s: %s.\n", c->log, c->cr_msg ); @@ -1467,7 +1468,7 @@ dds_cfgen( ConfigArgs *c ) if ( t <= 0 ) { snprintf( c->cr_msg, sizeof( c->cr_msg ), - "DDS invalid dds-interval=%ld", + "DDS invalid dds-interval=%lu", t ); Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, "%s: %s.\n", c->log, c->cr_msg ); @@ -1502,9 +1503,9 @@ dds_cfgen( ConfigArgs *c ) return 1; } - if ( t < 0 || t > DDS_RF2589_MAX_TTL ) { + if ( t > DDS_RF2589_MAX_TTL ) { snprintf( c->cr_msg, sizeof( c->cr_msg ), - "DDS invalid dds-tolerance=%ld", + "DDS invalid dds-tolerance=%lu", t ); Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, "%s: %s.\n", c->log, c->cr_msg ); @@ -1628,7 +1629,7 @@ dds_count( void *ctx, BackendDB *be ) int rc; char *extra = ""; - connection_fake_init( &conn, &opbuf, ctx ); + connection_fake_init2( &conn, &opbuf, ctx, 0 ); op = &opbuf.ob_op; op->o_tag = LDAP_REQ_SEARCH; @@ -1671,7 +1672,7 @@ dds_count( void *ctx, BackendDB *be ) done_search:; op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx ); - filter_free_x( op, op->ors_filter ); + filter_free_x( op, op->ors_filter, 1 ); rc = rs.sr_err; switch ( rs.sr_err ) { @@ -1707,6 +1708,9 @@ dds_db_open( int rc = 0; void *thrctx = ldap_pvt_thread_pool_context(); + if ( slapMode & SLAP_TOOL_MODE ) + return 0; + if ( DDS_OFF( di ) ) { goto done; } @@ -1822,6 +1826,12 @@ slap_exop_refresh( op->o_req_dn = op->o_req_ndn; op->o_bd = select_backend( &op->o_req_ndn, 0 ); + if ( op->o_bd == NULL ) { + send_ldap_error( op, rs, LDAP_NO_SUCH_OBJECT, + "no global superior knowledge" ); + goto done; + } + if ( !SLAP_DYNAMIC( op->o_bd ) ) { send_ldap_error( op, rs, LDAP_UNAVAILABLE_CRITICAL_EXTENSION, "backend does not support dynamic directory services" );