X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmodify.c;h=c3b5fc9cc84629c5d1f6961ddbb5bd2a8f45c56f;hb=af423fd393488947252da5fd6cd927edfd1bf110;hp=8c0351046049f65a382f3eea426cf746c6054610;hpb=b76c56ba3f45576b9c418ea9fe7f7b3440052904;p=openldap diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c index 8c03510460..c3b5fc9cc8 100644 --- a/servers/slapd/modify.c +++ b/servers/slapd/modify.c @@ -13,22 +13,16 @@ #include "portable.h" #include -#include -#include -#include -#include -#include -#include "slap.h" -extern Backend *select_backend(); +#include +#include +#include + +#include "slap.h" -extern char *default_referral; -extern time_t currenttime; -extern pthread_mutex_t currenttime_mutex; -extern int global_lastmod; +static void modlist_free(LDAPModList *ml); +static void add_lastmods(Operation *op, LDAPModList **ml); -static void modlist_free(); -static void add_lastmods(); void do_modify( @@ -36,11 +30,11 @@ do_modify( Operation *op ) { - char *dn, *odn; + char *ndn; char *last; unsigned long tag, len; - LDAPMod *mods, *tmp; - LDAPMod **modtail; + LDAPModList *modlist, *tmp; + LDAPModList **modtail; Backend *be; Debug( LDAP_DEBUG_TRACE, "do_modify\n", 0, 0, 0 ); @@ -64,108 +58,111 @@ do_modify( * } */ - if ( ber_scanf( op->o_ber, "{a", &dn ) == LBER_ERROR ) { + if ( ber_scanf( op->o_ber, "{a" /*}*/, &ndn ) == LBER_ERROR ) { Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 ); send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL, "" ); return; } - odn = strdup( dn ); - dn_normalize( dn ); - Debug( LDAP_DEBUG_ARGS, "do_modify: dn (%s)\n", dn, 0, 0 ); + Debug( LDAP_DEBUG_ARGS, "do_modify: dn (%s)\n", ndn, 0, 0 ); + + (void) dn_normalize_case( ndn ); /* collect modifications & save for later */ - mods = NULL; - modtail = &mods; + modlist = NULL; + modtail = &modlist; + for ( tag = ber_first_element( op->o_ber, &len, &last ); tag != LBER_DEFAULT; tag = ber_next_element( op->o_ber, &len, last ) ) { - (*modtail) = (LDAPMod *) ch_calloc( 1, sizeof(LDAPMod) ); + (*modtail) = (LDAPModList *) ch_calloc( 1, sizeof(LDAPModList) ); - if ( ber_scanf( op->o_ber, "{i{a[V]}}", &(*modtail)->mod_op, - &(*modtail)->mod_type, &(*modtail)->mod_bvalues ) + if ( ber_scanf( op->o_ber, "{i{a[V]}}", &(*modtail)->ml_op, + &(*modtail)->ml_type, &(*modtail)->ml_bvalues ) == LBER_ERROR ) { send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL, "decoding error" ); - free( dn ); - free( odn ); + free( ndn ); free( *modtail ); - modlist_free( mods ); + *modtail = NULL; + modlist_free( modlist ); return; } - if ( (*modtail)->mod_op != LDAP_MOD_ADD && - (*modtail)->mod_op != LDAP_MOD_DELETE && - (*modtail)->mod_op != LDAP_MOD_REPLACE ) + if ( (*modtail)->ml_op != LDAP_MOD_ADD && + (*modtail)->ml_op != LDAP_MOD_DELETE && + (*modtail)->ml_op != LDAP_MOD_REPLACE ) { send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL, "unrecognized modify operation" ); - free( dn ); - free( odn ); - modlist_free( mods ); + free( ndn ); + modlist_free( modlist ); return; } - if ( (*modtail)->mod_bvalues == NULL && (*modtail)->mod_op - != LDAP_MOD_DELETE ) { + if ( (*modtail)->ml_bvalues == NULL + && (*modtail)->ml_op != LDAP_MOD_DELETE ) + { send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL, "no values given" ); - free( dn ); - free( odn ); - modlist_free( mods ); + free( ndn ); + modlist_free( modlist ); return; } - attr_normalize( (*modtail)->mod_type ); + attr_normalize( (*modtail)->ml_type ); - modtail = &(*modtail)->mod_next; + modtail = &(*modtail)->ml_next; } *modtail = NULL; #ifdef LDAP_DEBUG Debug( LDAP_DEBUG_ARGS, "modifications:\n", 0, 0, 0 ); - for ( tmp = mods; tmp != NULL; tmp = tmp->mod_next ) { - Debug( LDAP_DEBUG_ARGS, "\t%s: %s\n", tmp->mod_op - == LDAP_MOD_ADD ? "add" : (tmp->mod_op == LDAP_MOD_DELETE ? - "delete" : "replace"), tmp->mod_type, 0 ); + for ( tmp = modlist; tmp != NULL; tmp = tmp->ml_next ) { + Debug( LDAP_DEBUG_ARGS, "\t%s: %s\n", + tmp->ml_op == LDAP_MOD_ADD + ? "add" : (tmp->ml_op == LDAP_MOD_DELETE + ? "delete" : "replace"), tmp->ml_type, 0 ); } #endif Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d MOD dn=\"%s\"\n", - conn->c_connid, op->o_opid, dn, 0, 0 ); + conn->c_connid, op->o_opid, ndn, 0, 0 ); /* * We could be serving multiple database backends. Select the * appropriate one, or send a referral to our "referral server" * if we don't hold it. */ - if ( (be = select_backend( dn )) == NULL ) { - free( dn ); - free( odn ); - modlist_free( mods ); + if ( (be = select_backend( ndn )) == NULL ) { + free( ndn ); + modlist_free( modlist ); send_ldap_result( conn, op, LDAP_PARTIAL_RESULTS, NULL, default_referral ); return; } + /* alias suffix if approp */ + ndn = suffixAlias ( ndn, op, be ); + /* * do the modify if 1 && (2 || 3) * 1) there is a modify function implemented in this backend; * 2) this backend is master for what it holds; - * 3) it's a replica and the dn supplied is the updatedn. + * 3) it's a replica and the dn supplied is the update_ndn. */ - if ( be->be_modify != NULL ) { + if ( be->be_modify ) { /* do the update here */ - if ( be->be_updatedn == NULL || - strcasecmp( be->be_updatedn, op->o_dn ) == 0 ) { - + if ( be->be_update_ndn == NULL || + strcmp( be->be_update_ndn, op->o_ndn ) == 0 ) + { if ( (be->be_lastmod == ON || ( be->be_lastmod == UNDEFINED && - global_lastmod == ON ) ) && be->be_updatedn == NULL ) { - add_lastmods( op, &mods ); + global_lastmod == ON ) ) && be->be_update_ndn == NULL ) { + add_lastmods( op, &modlist ); } - if ( (*be->be_modify)( be, conn, op, odn, mods ) == 0 ) { - replog( be, LDAP_REQ_MODIFY, dn, mods, 0 ); + if ( (*be->be_modify)( be, conn, op, ndn, modlist ) == 0 ) { + replog( be, LDAP_REQ_MODIFY, ndn, modlist, 0 ); } /* send a referral */ @@ -178,36 +175,38 @@ do_modify( "Function not implemented" ); } - free( dn ); - free( odn ); - modlist_free( mods ); + free( ndn ); + modlist_free( modlist ); } static void modlist_free( - LDAPMod *mods + LDAPModList *ml ) { - LDAPMod *next; - - for ( ; mods != NULL; mods = next ) { - next = mods->mod_next; - free( mods->mod_type ); - if ( mods->mod_bvalues != NULL ) - ber_bvecfree( mods->mod_bvalues ); - free( mods ); + LDAPModList *next; + + for ( ; ml != NULL; ml = next ) { + next = ml->ml_next; + + free( ml->ml_type ); + if ( ml->ml_bvalues != NULL ) + ber_bvecfree( ml->ml_bvalues ); + + free( ml ); } } static void -add_lastmods( Operation *op, LDAPMod **mods ) +add_lastmods( Operation *op, LDAPModList **modlist ) { char buf[22]; struct berval bv; struct berval *bvals[2]; - LDAPMod **m; - LDAPMod *tmp; + LDAPModList **m; + LDAPModList *tmp; struct tm *ltm; + time_t currenttime; Debug( LDAP_DEBUG_TRACE, "add_lastmods\n", 0, 0, 0 ); @@ -215,20 +214,20 @@ add_lastmods( Operation *op, LDAPMod **mods ) bvals[1] = NULL; /* remove any attempts by the user to modify these attrs */ - for ( m = mods; *m != NULL; m = &(*m)->mod_next ) { - if ( strcasecmp( (*m)->mod_type, "modifytimestamp" ) == 0 || - strcasecmp( (*m)->mod_type, "modifiersname" ) == 0 || - strcasecmp( (*m)->mod_type, "createtimestamp" ) == 0 || - strcasecmp( (*m)->mod_type, "creatorsname" ) == 0 ) { + for ( m = modlist; *m != NULL; m = &(*m)->ml_next ) { + if ( strcasecmp( (*m)->ml_type, "modifytimestamp" ) == 0 || + strcasecmp( (*m)->ml_type, "modifiersname" ) == 0 || + strcasecmp( (*m)->ml_type, "createtimestamp" ) == 0 || + strcasecmp( (*m)->ml_type, "creatorsname" ) == 0 ) { Debug( LDAP_DEBUG_TRACE, "add_lastmods: found lastmod attr: %s\n", - (*m)->mod_type, 0, 0 ); + (*m)->ml_type, 0, 0 ); tmp = *m; - *m = (*m)->mod_next; - free( tmp->mod_type ); - if ( tmp->mod_bvalues != NULL ) { - ber_bvecfree( tmp->mod_bvalues ); + *m = (*m)->ml_next; + free( tmp->ml_type ); + if ( tmp->ml_bvalues != NULL ) { + ber_bvecfree( tmp->ml_bvalues ); } free( tmp ); if (!*m) @@ -243,30 +242,32 @@ add_lastmods( Operation *op, LDAPMod **mods ) bv.bv_val = op->o_dn; bv.bv_len = strlen( bv.bv_val ); } - tmp = (LDAPMod *) ch_calloc( 1, sizeof(LDAPMod) ); - tmp->mod_type = strdup( "modifiersname" ); - tmp->mod_op = LDAP_MOD_REPLACE; - tmp->mod_bvalues = (struct berval **) ch_calloc( 1, - 2 * sizeof(struct berval *) ); - tmp->mod_bvalues[0] = ber_bvdup( &bv ); - tmp->mod_next = *mods; - *mods = tmp; - - pthread_mutex_lock( ¤ttime_mutex ); - ltm = localtime( ¤ttime ); -#ifdef LDAP_Y2K + tmp = (LDAPModList *) ch_calloc( 1, sizeof(LDAPModList) ); + tmp->ml_type = ch_strdup( "modifiersname" ); + tmp->ml_op = LDAP_MOD_REPLACE; + tmp->ml_bvalues = (struct berval **) ch_calloc(2, sizeof(struct berval *)); + tmp->ml_bvalues[0] = ber_bvdup( &bv ); + tmp->ml_next = *modlist; + *modlist = tmp; + + currenttime = slap_get_time(); + ldap_pvt_thread_mutex_lock( &gmtime_mutex ); +#ifndef LDAP_LOCALTIME + ltm = gmtime( ¤ttime ); strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm ); #else + ltm = localtime( ¤ttime ); strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm ); #endif - pthread_mutex_unlock( ¤ttime_mutex ); + ldap_pvt_thread_mutex_unlock( &gmtime_mutex ); + bv.bv_val = buf; bv.bv_len = strlen( bv.bv_val ); - tmp = (LDAPMod *) ch_calloc( 1, sizeof(LDAPMod) ); - tmp->mod_type = strdup( "modifytimestamp" ); - tmp->mod_op = LDAP_MOD_REPLACE; - tmp->mod_bvalues = (struct berval **) ch_calloc( 1, 2 * sizeof(struct berval *) ); - tmp->mod_bvalues[0] = ber_bvdup( &bv ); - tmp->mod_next = *mods; - *mods = tmp; + tmp = (LDAPModList *) ch_calloc( 1, sizeof(LDAPModList) ); + tmp->ml_type = ch_strdup( "modifytimestamp" ); + tmp->ml_op = LDAP_MOD_REPLACE; + tmp->ml_bvalues = (struct berval **) ch_calloc(2, sizeof(struct berval *)); + tmp->ml_bvalues[0] = ber_bvdup( &bv ); + tmp->ml_next = *modlist; + *modlist = tmp; }