X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foverlays%2Fdds.c;h=900c6fd3e356a3dd633af0057995774544403350;hb=aba681fa807c526a01afff98d2bf2c7c4b241c78;hp=5235a836214ea8b8d1aea0213cf981599937e748;hpb=93fbb87545fd670f93a758f1baf1a67f3c4803ea;p=openldap diff --git a/servers/slapd/overlays/dds.c b/servers/slapd/overlays/dds.c index 5235a83621..900c6fd3e3 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-2013 The OpenLDAP Foundation. * Portions Copyright 2005-2006 SysNet s.n.c. * All rights reserved. * @@ -134,13 +134,16 @@ dds_expire( void *ctx, dds_info_t *di ) int ndeletes, ntotdeletes; - connection_fake_init( &conn, &opbuf, ctx ); + int rc; + char *extra = ""; + + connection_fake_init2( &conn, &opbuf, ctx, 0 ); op = &opbuf.ob_op; op->o_tag = LDAP_REQ_SEARCH; memset( &op->oq_search, 0, sizeof( op->oq_search ) ); - op->o_bd = select_backend( &di->di_nsuffix[ 0 ], 0, 0 ); + op->o_bd = select_backend( &di->di_nsuffix[ 0 ], 0 ); op->o_req_dn = op->o_bd->be_suffix[ 0 ]; op->o_req_ndn = op->o_bd->be_nsuffix[ 0 ]; @@ -153,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 ); @@ -182,12 +185,23 @@ 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 ); - if ( rs.sr_err != LDAP_SUCCESS ) { - Log1( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, - "DDS expired objects lookup failed err=%d\n", - rs.sr_err ); + rc = rs.sr_err; + switch ( rs.sr_err ) { + case LDAP_SUCCESS: + break; + + case LDAP_NO_SUCH_OBJECT: + /* (ITS#5267) database not created yet? */ + rs.sr_err = LDAP_SUCCESS; + extra = " (ignored)"; + /* fallthru */ + + default: + Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, + "DDS expired objects lookup failed err=%d%s\n", + rc, extra ); goto done; } @@ -229,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 ); } } @@ -381,7 +394,7 @@ dds_op_add( Operation *op, SlapReply *rs ) /* handle dynamic object operational attr(s) */ if ( is_dynamicObject ) { time_t ttl, expire; - char ttlbuf[] = "31557600"; + char ttlbuf[STRLENOF("31557600") + 1]; char tsbuf[ LDAP_LUTIL_GENTIME_BUFSIZE ]; struct berval bv; @@ -400,10 +413,12 @@ dds_op_add( Operation *op, SlapReply *rs ) ttl = DDS_DEFAULT_TTL( di ); + /* assert because should be checked at configure */ assert( ttl <= DDS_RF2589_MAX_TTL ); bv.bv_val = ttlbuf; bv.bv_len = snprintf( ttlbuf, sizeof( ttlbuf ), "%ld", ttl ); + assert( bv.bv_len < sizeof( ttlbuf ) ); /* FIXME: apparently, values in op->ora_e are malloc'ed * on the thread's slab; works fine by chance, @@ -566,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 ] ) ) @@ -595,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 ] ) ); @@ -613,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; @@ -630,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'; @@ -788,6 +807,7 @@ done:; tmpmod->sml_op = LDAP_MOD_REPLACE; value_add_one( &tmpmod->sml_values, &bv ); value_add_one( &tmpmod->sml_nvalues, &bv ); + tmpmod->sml_numvals = 1; } } @@ -948,7 +968,7 @@ slap_parse_refresh( tag = ber_peek_tag( ber, &len ); - if ( len != 0 ) { + if ( tag != LBER_DEFAULT || len != 0 ) { decoding_error:; Log1( LDAP_DEBUG_TRACE, LDAP_LEVEL_ERR, "slap_parse_refresh: decoding error, len=%ld\n", @@ -989,7 +1009,7 @@ dds_op_extended( Operation *op, SlapReply *rs ) slap_callback sc = { 0 }; Modifications ttlmod = { { 0 } }; struct berval ttlvalues[ 2 ]; - char ttlbuf[] = "31557600"; + char ttlbuf[STRLENOF("31557600") + 1]; rs->sr_err = slap_parse_refresh( op->ore_reqdata, NULL, &ttl, &rs->sr_text, NULL ); @@ -1087,6 +1107,7 @@ dds_op_extended( Operation *op, SlapReply *rs ) ttlmod.sml_flags = SLAP_MOD_MANAGING; ttlmod.sml_desc = slap_schema.si_ad_entryTtl; ttlmod.sml_values = ttlvalues; + ttlmod.sml_numvals = 1; ttlvalues[ 0 ].bv_val = ttlbuf; ttlvalues[ 0 ].bv_len = snprintf( ttlbuf, sizeof( ttlbuf ), "%ld", ttl ); BER_BVZERO( &ttlvalues[ 1 ] ); @@ -1103,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 ); - - rc = ber_printf( ber, "{tiN}", LDAP_TAG_EXOP_REFRESH_RES_TTL, (int)ttl ); + ber_init_w_nullc( ber, LBER_USE_DER ); - if ( rc < 0 ) { - rs->sr_err = LDAP_OTHER; - rs->sr_text = "internal error"; + rc = ber_printf( ber, "{tiN}", LDAP_TAG_EXOP_REFRESH_RES_TTL, (int)ttl ); - } 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; @@ -1363,20 +1382,20 @@ dds_cfgen( ConfigArgs *c ) case DDS_MAXTTL: if ( lutil_parse_time( c->argv[ 1 ], &t ) != 0 ) { - snprintf( c->msg, sizeof( c->msg), + snprintf( c->cr_msg, sizeof( c->cr_msg), "DDS unable to parse dds-max-ttl \"%s\"", c->argv[ 1 ] ); Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, - "%s: %s.\n", c->log, c->msg ); + "%s: %s.\n", c->log, c->cr_msg ); return 1; } if ( t < DDS_RF2589_DEFAULT_TTL || t > DDS_RF2589_MAX_TTL ) { - snprintf( c->msg, sizeof( c->msg ), - "DDS invalid dds-max-ttl=%ld; must be between %d and %d", + snprintf( c->cr_msg, sizeof( c->cr_msg ), + "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->msg ); + "%s: %s.\n", c->log, c->cr_msg ); return 1; } @@ -1385,20 +1404,20 @@ dds_cfgen( ConfigArgs *c ) case DDS_MINTTL: if ( lutil_parse_time( c->argv[ 1 ], &t ) != 0 ) { - snprintf( c->msg, sizeof( c->msg), + snprintf( c->cr_msg, sizeof( c->cr_msg), "DDS unable to parse dds-min-ttl \"%s\"", c->argv[ 1 ] ); Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, - "%s: %s.\n", c->log, c->msg ); + "%s: %s.\n", c->log, c->cr_msg ); return 1; } - if ( t < 0 || t > DDS_RF2589_MAX_TTL ) { - snprintf( c->msg, sizeof( c->msg ), - "DDS invalid dds-min-ttl=%ld", + if ( t > DDS_RF2589_MAX_TTL ) { + snprintf( c->cr_msg, sizeof( c->cr_msg ), + "DDS invalid dds-min-ttl=%lu", t ); Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, - "%s: %s.\n", c->log, c->msg ); + "%s: %s.\n", c->log, c->cr_msg ); return 1; } @@ -1412,20 +1431,20 @@ dds_cfgen( ConfigArgs *c ) case DDS_DEFAULTTTL: if ( lutil_parse_time( c->argv[ 1 ], &t ) != 0 ) { - snprintf( c->msg, sizeof( c->msg), + snprintf( c->cr_msg, sizeof( c->cr_msg), "DDS unable to parse dds-default-ttl \"%s\"", c->argv[ 1 ] ); Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, - "%s: %s.\n", c->log, c->msg ); + "%s: %s.\n", c->log, c->cr_msg ); return 1; } - if ( t < 0 || t > DDS_RF2589_MAX_TTL ) { - snprintf( c->msg, sizeof( c->msg ), - "DDS invalid dds-default-ttl=%ld", + if ( t > DDS_RF2589_MAX_TTL ) { + snprintf( c->cr_msg, sizeof( c->cr_msg ), + "DDS invalid dds-default-ttl=%lu", t ); Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, - "%s: %s.\n", c->log, c->msg ); + "%s: %s.\n", c->log, c->cr_msg ); return 1; } @@ -1439,20 +1458,20 @@ dds_cfgen( ConfigArgs *c ) case DDS_INTERVAL: if ( lutil_parse_time( c->argv[ 1 ], &t ) != 0 ) { - snprintf( c->msg, sizeof( c->msg), + snprintf( c->cr_msg, sizeof( c->cr_msg), "DDS unable to parse dds-interval \"%s\"", c->argv[ 1 ] ); Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, - "%s: %s.\n", c->log, c->msg ); + "%s: %s.\n", c->log, c->cr_msg ); return 1; } if ( t <= 0 ) { - snprintf( c->msg, sizeof( c->msg ), - "DDS invalid dds-interval=%ld", + snprintf( c->cr_msg, sizeof( c->cr_msg ), + "DDS invalid dds-interval=%lu", t ); Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, - "%s: %s.\n", c->log, c->msg ); + "%s: %s.\n", c->log, c->cr_msg ); return 1; } @@ -1476,20 +1495,20 @@ dds_cfgen( ConfigArgs *c ) case DDS_TOLERANCE: if ( lutil_parse_time( c->argv[ 1 ], &t ) != 0 ) { - snprintf( c->msg, sizeof( c->msg), + snprintf( c->cr_msg, sizeof( c->cr_msg), "DDS unable to parse dds-tolerance \"%s\"", c->argv[ 1 ] ); Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, - "%s: %s.\n", c->log, c->msg ); + "%s: %s.\n", c->log, c->cr_msg ); return 1; } - if ( t < 0 || t > DDS_RF2589_MAX_TTL ) { - snprintf( c->msg, sizeof( c->msg ), - "DDS invalid dds-tolerance=%ld", + if ( t > DDS_RF2589_MAX_TTL ) { + snprintf( c->cr_msg, sizeof( c->cr_msg ), + "DDS invalid dds-tolerance=%lu", t ); Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, - "%s: %s.\n", c->log, c->msg ); + "%s: %s.\n", c->log, c->cr_msg ); return 1; } @@ -1498,10 +1517,10 @@ dds_cfgen( ConfigArgs *c ) case DDS_MAXDYNAMICOBJS: if ( c->value_int < 0 ) { - snprintf( c->msg, sizeof( c->msg ), + snprintf( c->cr_msg, sizeof( c->cr_msg ), "DDS invalid dds-max-dynamicObjects=%d", c->value_int ); Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, - "%s: %s.\n", c->log, c->msg ); + "%s: %s.\n", c->log, c->cr_msg ); return 1; } di->di_max_dynamicObjects = c->value_int; @@ -1517,7 +1536,8 @@ dds_cfgen( ConfigArgs *c ) static int dds_db_init( - BackendDB *be ) + BackendDB *be, + ConfigReply *cr) { slap_overinst *on = (slap_overinst *)be->bd_info; dds_info_t *di; @@ -1606,7 +1626,10 @@ dds_count( void *ctx, BackendDB *be ) slap_callback sc = { 0 }; SlapReply rs = { REP_RESULT }; - connection_fake_init( &conn, &opbuf, ctx ); + int rc; + char *extra = ""; + + connection_fake_init2( &conn, &opbuf, ctx, 0 ); op = &opbuf.ob_op; op->o_tag = LDAP_REQ_SEARCH; @@ -1641,6 +1664,7 @@ dds_count( void *ctx, BackendDB *be ) op->o_callback = ≻ sc.sc_response = dds_count_cb; sc.sc_private = &di->di_num_dynamicObjects; + di->di_num_dynamicObjects = 0; op->o_bd->bd_info = (BackendInfo *)on->on_info; (void)op->o_bd->bd_info->bi_op_search( op, &rs ); @@ -1648,17 +1672,27 @@ 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 ); - if ( rs.sr_err == LDAP_SUCCESS ) { + rc = rs.sr_err; + switch ( rs.sr_err ) { + case LDAP_SUCCESS: Log1( LDAP_DEBUG_STATS, LDAP_LEVEL_INFO, "DDS non-expired=%d\n", di->di_num_dynamicObjects ); + break; - } else { - Log1( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, - "DDS non-expired objects lookup failed err=%d\n", - rs.sr_err ); + case LDAP_NO_SUCH_OBJECT: + /* (ITS#5267) database not created yet? */ + rs.sr_err = LDAP_SUCCESS; + extra = " (ignored)"; + /* fallthru */ + + default: + Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, + "DDS non-expired objects lookup failed err=%d%s\n", + rc, extra ); + break; } return rs.sr_err; @@ -1666,13 +1700,17 @@ done_search:; static int dds_db_open( - BackendDB *be ) + BackendDB *be, + ConfigReply *cr ) { slap_overinst *on = (slap_overinst *)be->bd_info; dds_info_t *di = on->on_bi.bi_private; int rc = 0; void *thrctx = ldap_pvt_thread_pool_context(); + if ( slapMode & SLAP_TOOL_MODE ) + return 0; + if ( DDS_OFF( di ) ) { goto done; } @@ -1731,7 +1769,8 @@ done:; static int dds_db_close( - BackendDB *be ) + BackendDB *be, + ConfigReply *cr ) { slap_overinst *on = (slap_overinst *)be->bd_info; dds_info_t *di = on->on_bi.bi_private; @@ -1753,7 +1792,8 @@ dds_db_close( static int dds_db_destroy( - BackendDB *be ) + BackendDB *be, + ConfigReply *cr ) { slap_overinst *on = (slap_overinst *)be->bd_info; dds_info_t *di = on->on_bi.bi_private; @@ -1785,7 +1825,13 @@ slap_exop_refresh( op->o_log_prefix, op->o_req_ndn.bv_val ); op->o_req_dn = op->o_req_ndn; - op->o_bd = select_backend( &op->o_req_ndn, 0, 0 ); + 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" ); @@ -1838,6 +1884,7 @@ dds_initialize() if ( !do_not_load_schema ) { static struct { char *desc; + slap_mask_t flags; AttributeDescription **ad; } s_at[] = { { "( 1.3.6.1.4.1.4203.666.1.57 " @@ -1850,6 +1897,7 @@ dds_initialize() "SINGLE-VALUE " "NO-USER-MODIFICATION " "USAGE dSAOperation )", + SLAP_AT_HIDE, &ad_entryExpireTimestamp }, { NULL } }; @@ -1861,6 +1909,7 @@ dds_initialize() "dds_initialize: register_at failed\n", 0, 0, 0 ); return code; } + (*s_at[ i ].ad)->ad_type->sat_flags |= SLAP_AT_HIDE; } }