/* $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
Modifications *tmp;
#endif
int manageDSAit;
- Modifications *modlist = op->orm_modlist;
- int increment = op->orm_increment;
- BackendDB *op_be;
+ BackendDB *op_be;
char textbuf[ SLAP_TEXT_BUFLEN ];
size_t textlen = sizeof( textbuf );
- if( BER_BVISEMPTY( &op->o_req_ndn ) ) {
+ if ( BER_BVISEMPTY( &op->o_req_ndn ) ) {
Debug( LDAP_DEBUG_ANY, "do_modify: root dse!\n", 0, 0, 0 );
send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
#ifdef LDAP_DEBUG
Debug( LDAP_DEBUG_ARGS, "modifications:\n", 0, 0, 0 );
- for ( tmp = modlist; tmp != NULL; tmp = tmp->sml_next ) {
+ for ( tmp = op->orm_modlist; tmp != NULL; tmp = tmp->sml_next ) {
Debug( LDAP_DEBUG_ARGS, "\t%s: %s\n",
tmp->sml_op == LDAP_MOD_ADD ? "add" :
(tmp->sml_op == LDAP_MOD_INCREMENT ? "increment" :
Statslog( LDAP_DEBUG_STATS, "%s MOD dn=\"%s\"\n",
op->o_log_prefix, op->o_req_dn.bv_val, 0, 0, 0 );
- for ( tmp = modlist; tmp != NULL; tmp = tmp->sml_next ) {
+ for ( tmp = op->orm_modlist; tmp != NULL; tmp = tmp->sml_next ) {
if (len + 1 + tmp->sml_type.bv_len > sizeof(abuf)) {
Statslog( LDAP_DEBUG_STATS, "%s MOD attr=%s\n",
op->o_log_prefix, abuf, 0, 0, 0 );
if ( op->o_bd == NULL ) {
rs->sr_ref = referral_rewrite( default_referral,
NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
- if (!rs->sr_ref) rs->sr_ref = default_referral;
+ if ( !rs->sr_ref ) {
+ rs->sr_ref = default_referral;
+ }
- if (rs->sr_ref != NULL ) {
+ if ( rs->sr_ref != NULL ) {
rs->sr_err = LDAP_REFERRAL;
op->o_bd = frontendDB;
send_ldap_result( op, rs );
op->o_bd = NULL;
- if (rs->sr_ref != default_referral) ber_bvarray_free( rs->sr_ref );
+ if ( rs->sr_ref != default_referral ) {
+ ber_bvarray_free( rs->sr_ref );
+ }
+
} else {
op->o_bd = frontendDB;
send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
}
/* check restrictions */
- if( backend_check_restrictions( op, rs, NULL ) != LDAP_SUCCESS ) {
+ if ( backend_check_restrictions( op, rs, NULL ) != LDAP_SUCCESS ) {
send_ldap_result( op, rs );
goto cleanup;
}
/* check for referrals */
- if( backend_check_referrals( op, rs ) != LDAP_SUCCESS ) {
+ if ( backend_check_referrals( op, rs ) != LDAP_SUCCESS ) {
goto cleanup;
}
- rs->sr_err = slap_mods_obsolete_check( op, modlist,
+ rs->sr_err = slap_mods_obsolete_check( op, op->orm_modlist,
&rs->sr_text, textbuf, textlen );
if ( rs->sr_err != LDAP_SUCCESS ) {
send_ldap_result( op, rs );
}
/* check for modify/increment support */
- if( increment && !SLAP_INCREMENT( op->o_bd ) ) {
+ if ( op->orm_increment && !SLAP_INCREMENT( op->o_bd ) ) {
send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
"modify/increment not supported in context" );
}
*/
#ifndef SLAPD_MULTIMASTER
if ( !SLAP_SHADOW(op->o_bd) || repl_user )
-#endif
+#endif /* ! SLAPD_MULTIMASTER */
{
int update = !BER_BVISEMPTY( &op->o_bd->be_update_ndn );
slap_callback cb = { NULL, slap_replog_cb, NULL, NULL };
op->o_bd = op_be;
if ( !update ) {
- rs->sr_err = slap_mods_no_user_mod_check( op, modlist,
+ rs->sr_err = slap_mods_no_user_mod_check( op, op->orm_modlist,
&rs->sr_text, textbuf, textlen );
if ( rs->sr_err != LDAP_SUCCESS ) {
send_ldap_result( op, rs );
}
}
- op->orm_modlist = modlist;
#ifdef SLAPD_MULTIMASTER
if ( !repl_user )
-#endif
+#endif /* SLAPD_MULTIMASTER */
{
/* but multimaster slapd logs only the ones
* not from a replicator user */
send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
"shadow context; no update referral" );
}
-#endif
+#endif /* ! SLAPD_MULTIMASTER */
}
} else {
send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
size_t textlen )
{
for ( ; ml != NULL; ml = ml->sml_next ) {
- if ( !is_at_no_user_mod( ml->sml_desc->ad_type ) ) continue;
+ if ( !is_at_no_user_mod( ml->sml_desc->ad_type ) ) {
+ continue;
+ }
if ( get_manageDIT( op ) ) {
if ( ml->sml_desc->ad_type->sat_flags & SLAP_AT_MANAGEABLE ) {
snprintf( textbuf, textlen,
"attribute '%s' provided more than once",
mods->sml_desc->ad_cname.bv_val );
+ *text = textbuf;
return LDAP_TYPE_OR_VALUE_EXISTS;
}
}
} else {
#ifdef SLAP_ORDERED_PRETTYNORM
rc = ordered_value_validate( ad,
- &ml->sml_values[nvals] );
+ &ml->sml_values[nvals], ml->sml_op );
#else /* ! SLAP_ORDERED_PRETTYNORM */
rc = validate( ad->ad_type->sat_syntax,
&ml->sml_values[nvals] );
*/
void slap_mods_opattrs(
Operation *op,
- Modifications *mods,
+ Modifications **modsp,
int manage_ctxcsn )
{
struct berval name, timestamp, csn = BER_BVNULL;
csn = op->o_csn;
}
ptr = ber_bvchr( &csn, '#' );
- if ( ptr && ptr < &csn.bv_val[csn.bv_len] ) {
+ if ( ptr ) {
timestamp.bv_len = ptr - csn.bv_val;
- if ( timestamp.bv_len >= sizeof( timebuf ))
+ if ( timestamp.bv_len >= sizeof( timebuf )) /* ?!? */
timestamp.bv_len = sizeof( timebuf ) - 1;
- strncpy( timebuf, csn.bv_val, timestamp.bv_len );
+ AC_MEMCPY( timebuf, csn.bv_val, timestamp.bv_len );
timebuf[timestamp.bv_len] = '\0';
} else {
time_t now = slap_get_time();
nname = op->o_ndn;
}
- for ( mod = mods; mod->sml_next; mod = mod->sml_next )
+ for ( modtail = modsp; *modtail; modtail = &(*modtail)->sml_next )
;
- modtail = &mod->sml_next;
mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
mod->sml_op = LDAP_MOD_REPLACE;
modtail = &mod->sml_next;
if ( get_manageDIT( op ) ) {
- for ( mod = mods; mod != modlast; mod = mod->sml_next ) {
+ for ( mod = *modsp; mod != modlast; mod = mod->sml_next ) {
if ( mod->sml_desc == slap_schema.si_ad_modifiersName ) {
break;
}
}
if ( get_manageDIT( op ) ) {
- for ( mod = mods; mod != modlast; mod = mod->sml_next ) {
+ for ( mod = *modsp; mod != modlast; mod = mod->sml_next ) {
if ( mod->sml_desc == slap_schema.si_ad_modifyTimestamp ) {
break;
}