X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fback-ldap%2Fadd.c;h=827dd42522340162dff777416715e3a5ae40e8e8;hb=6018fe9671dcbb90e3845bc14851858c5d9fdf2a;hp=a9be70d466d6f08e405ab218903670a3f08bdaa6;hpb=77c4389f551b5177ca0cf6df41e1765557fe2e05;p=openldap diff --git a/servers/slapd/back-ldap/add.c b/servers/slapd/back-ldap/add.c index a9be70d466..827dd42522 100644 --- a/servers/slapd/back-ldap/add.c +++ b/servers/slapd/back-ldap/add.c @@ -1,38 +1,24 @@ /* add.c - ldap backend add function */ /* $OpenLDAP$ */ -/* - * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file - */ -/* This is an altered version */ -/* - * Copyright 1999, Howard Chu, All rights reserved. - * - * Permission is granted to anyone to use this software for any purpose - * on any computer system, and to alter it and redistribute it, subject - * to the following restrictions: - * - * 1. The author is not responsible for the consequences of use of this - * software, no matter how awful, even if they arise from flaws in it. - * - * 2. The origin of this software must not be misrepresented, either by - * explicit claim or by omission. Since few users ever read sources, - * credits should appear in the documentation. - * - * 3. Altered versions must be plainly marked as such, and must not be - * misrepresented as being the original software. Since few users - * ever read sources, credits should appear in the documentation. - * - * 4. This notice may not be removed or altered. - * +/* This work is part of OpenLDAP Software . * + * Copyright 1999-2011 The OpenLDAP Foundation. + * Portions Copyright 2000-2003 Pierangelo Masarati. + * Portions Copyright 1999-2003 Howard Chu. + * All rights reserved. * - * Copyright 2000, Pierangelo Masarati, All rights reserved. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. * - * This software is being modified by Pierangelo Masarati. - * The previously reported conditions apply to the modified code as well. - * Changes in the original code are highlighted where required. - * Credits for the original code go to the author, Howard Chu. + * A copy of this license is available in the file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . + */ +/* ACKNOWLEDGEMENTS: + * This work was initially developed by the Howard Chu for inclusion + * in OpenLDAP Software and subsequently enhanced by Pierangelo + * Masarati. */ #include "portable.h" @@ -47,149 +33,103 @@ int ldap_back_add( - Operation *op, - SlapReply *rs ) + Operation *op, + SlapReply *rs ) { - struct ldapinfo *li = (struct ldapinfo *) op->o_bd->be_private; - struct ldapconn *lc; - int i, j; - Attribute *a; - LDAPMod **attrs; - struct berval mapped; - struct berval mdn = { 0, NULL }; - ber_int_t msgid; - dncookie dc; - -#ifdef NEW_LOGGING - LDAP_LOG( BACK_LDAP, ENTRY, "ldap_back_add: %s\n", op->o_req_dn.bv_val, 0, 0 ); -#else /* !NEW_LOGGING */ - Debug(LDAP_DEBUG_ARGS, "==> ldap_back_add: %s\n", op->o_req_dn.bv_val, 0, 0); -#endif /* !NEW_LOGGING */ + ldapinfo_t *li = (ldapinfo_t *)op->o_bd->be_private; + + ldapconn_t *lc = NULL; + int i = 0, + j = 0; + Attribute *a; + LDAPMod **attrs = NULL, + *attrs2 = NULL; + ber_int_t msgid; + int isupdate; + ldap_back_send_t retrying = LDAP_BACK_RETRYING; + LDAPControl **ctrls = NULL; + + rs->sr_err = LDAP_SUCCESS; - lc = ldap_back_getconn(op, rs); - if ( !lc || !ldap_back_dobind( lc, op, rs ) ) { - return( -1 ); - } + Debug( LDAP_DEBUG_ARGS, "==> ldap_back_add(\"%s\")\n", + op->o_req_dn.bv_val, 0, 0 ); - /* - * Rewrite the add dn, if needed - */ -#ifdef ENABLE_REWRITE - dc.rw = li->rwinfo; - dc.conn = op->o_conn; - dc.rs = rs; - dc.ctx = "addDn"; -#else - dc.li = li; - dc.tofrom = 1; - dc.normalized = 0; -#endif - if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) { - send_ldap_result( op, rs ); - return -1; + if ( !ldap_back_dobind( &lc, op, rs, LDAP_BACK_SENDERR ) ) { + lc = NULL; + goto cleanup; } /* Count number of attributes in entry */ - for (i = 1, a = op->oq_add.rs_e->e_attrs; a; i++, a = a->a_next) - ; + for ( i = 1, a = op->oq_add.rs_e->e_attrs; a; i++, a = a->a_next ) + /* just count attrs */ ; /* Create array of LDAPMods for ldap_add() */ - attrs = (LDAPMod **)ch_malloc(sizeof(LDAPMod *)*i); - -#ifdef ENABLE_REWRITE - dc.ctx = "addDnAttr"; -#endif - for (i=0, a=op->oq_add.rs_e->e_attrs; a; a=a->a_next) { - if ( a->a_desc->ad_type->sat_no_user_mod ) { - continue; - } - - ldap_back_map(&li->at_map, &a->a_desc->ad_cname, &mapped, - BACKLDAP_MAP); - if (mapped.bv_val == NULL || mapped.bv_val[0] == '\0') { + attrs = (LDAPMod **)ch_malloc( sizeof( LDAPMod * )*i + + sizeof( LDAPMod )*( i - 1 ) ); + attrs2 = ( LDAPMod * )&attrs[ i ]; + + isupdate = be_shadow_update( op ); + for ( i = 0, a = op->oq_add.rs_e->e_attrs; a; a = a->a_next ) { + if ( !isupdate && !get_relax( op ) && a->a_desc->ad_type->sat_no_user_mod ) + { continue; } - attrs[i] = (LDAPMod *)ch_malloc(sizeof(LDAPMod)); - if (attrs[i] == NULL) { - continue; - } + attrs[ i ] = &attrs2[ i ]; + attrs[ i ]->mod_op = LDAP_MOD_BVALUES; + attrs[ i ]->mod_type = a->a_desc->ad_cname.bv_val; - attrs[i]->mod_op = LDAP_MOD_BVALUES; - attrs[i]->mod_type = mapped.bv_val; - - if ( a->a_desc->ad_type->sat_syntax == - slap_schema.si_syn_distinguishedName ) { - /* - * FIXME: rewrite could fail; in this case - * the operation should give up, right? - */ - (void)ldap_dnattr_rewrite( &dc, a->a_vals ); + for ( j = 0; a->a_vals[ j ].bv_val; j++ ) + /* just count vals */ ; + attrs[i]->mod_vals.modv_bvals = + ch_malloc( ( j + 1 )*sizeof( struct berval * ) ); + for ( j = 0; a->a_vals[ j ].bv_val; j++ ) { + attrs[ i ]->mod_vals.modv_bvals[ j ] = &a->a_vals[ j ]; } - - for (j=0; a->a_vals[j].bv_val; j++); - attrs[i]->mod_vals.modv_bvals = ch_malloc((j+1)*sizeof(struct berval *)); - for (j=0; a->a_vals[j].bv_val; j++) - attrs[i]->mod_vals.modv_bvals[j] = &a->a_vals[j]; - attrs[i]->mod_vals.modv_bvals[j] = NULL; + attrs[ i ]->mod_vals.modv_bvals[ j ] = NULL; i++; } - attrs[i] = NULL; + attrs[ i ] = NULL; - rs->sr_err = ldap_add_ext(lc->ld, mdn.bv_val, attrs, - op->o_ctrls, NULL, &msgid); - for (--i; i>= 0; --i) { - ch_free(attrs[i]->mod_vals.modv_bvals); - ch_free(attrs[i]); +retry: + ctrls = op->o_ctrls; + rs->sr_err = ldap_back_controls_add( op, rs, lc, &ctrls ); + if ( rs->sr_err != LDAP_SUCCESS ) { + send_ldap_result( op, rs ); + goto cleanup; } - ch_free(attrs); - if ( mdn.bv_val != op->o_req_dn.bv_val ) { - free( mdn.bv_val ); + + rs->sr_err = ldap_add_ext( lc->lc_ld, op->o_req_dn.bv_val, attrs, + ctrls, NULL, &msgid ); + rs->sr_err = ldap_back_op_result( lc, op, rs, msgid, + li->li_timeout[ SLAP_OP_ADD ], + ( LDAP_BACK_SENDRESULT | retrying ) ); + if ( rs->sr_err == LDAP_UNAVAILABLE && retrying ) { + retrying &= ~LDAP_BACK_RETRYING; + if ( ldap_back_retry( &lc, op, rs, LDAP_BACK_SENDERR ) ) { + /* if the identity changed, there might be need to re-authz */ + (void)ldap_back_controls_free( op, rs, &ctrls ); + goto retry; + } } - - return ldap_back_op_result( lc, op, rs, msgid, 1 ) != LDAP_SUCCESS; -} -int -ldap_dnattr_rewrite( - dncookie *dc, - BerVarray a_vals -) -{ - struct berval bv; - int i, last; - - for ( last = 0; a_vals[last].bv_val != NULL; last++ ); - last--; - - for ( i = 0; a_vals[i].bv_val != NULL; i++ ) { - switch ( ldap_back_dn_massage( dc, &a_vals[i], &bv ) ) { - case LDAP_SUCCESS: - case LDAP_OTHER: /* ? */ - default: /* ??? */ - /* leave attr untouched if massage failed */ - if ( bv.bv_val && bv.bv_val != a_vals[i].bv_val ) { - ch_free( a_vals[i].bv_val ); - a_vals[i] = bv; - } - break; - - case LDAP_UNWILLING_TO_PERFORM: - /* - * FIXME: need to check if it may be considered - * legal to trim values when adding/modifying; - * it should be when searching (see ACLs). - */ - ch_free( a_vals[i].bv_val ); - if (last > i ) { - a_vals[i] = a_vals[last]; - } - a_vals[last].bv_len = 0; - a_vals[last].bv_val = NULL; - last--; - break; +cleanup: + (void)ldap_back_controls_free( op, rs, &ctrls ); + + if ( attrs ) { + for ( --i; i >= 0; --i ) { + ch_free( attrs[ i ]->mod_vals.modv_bvals ); } + ch_free( attrs ); } - - return 0; + + if ( lc ) { + ldap_back_release_conn( li, lc ); + } + + Debug( LDAP_DEBUG_ARGS, "<== ldap_back_add(\"%s\"): %d\n", + op->o_req_dn.bv_val, rs->sr_err, 0 ); + + return rs->sr_err; } +