X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldap%2Fadd.c;h=699503aca8e25093a511afa326f6c733a8de9b66;hb=9f6f5491fe55d31cc5eceab59be6bcdc47ea4282;hp=13064fd27ff95f31a6743131a7ffe341eae106e2;hpb=693fb9424a17799192116e8ce007c4070798cdeb;p=openldap diff --git a/servers/slapd/back-ldap/add.c b/servers/slapd/back-ldap/add.c index 13064fd27f..699503aca8 100644 --- a/servers/slapd/back-ldap/add.c +++ b/servers/slapd/back-ldap/add.c @@ -1,25 +1,24 @@ /* add.c - ldap backend add function */ /* $OpenLDAP$ */ - -/* - * 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-2004 The OpenLDAP Foundation. + * Portions Copyright 2000-2003 Pierangelo Masarati. + * Portions Copyright 1999-2003 Howard Chu. + * 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. + * + * 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" @@ -34,46 +33,134 @@ int ldap_back_add( - Backend *be, - Connection *conn, Operation *op, - Entry *e -) + SlapReply *rs ) { - struct ldapinfo *li = (struct ldapinfo *) be->be_private; + struct ldapinfo *li = (struct ldapinfo *) op->o_bd->be_private; struct ldapconn *lc; - int i; + int i, j; Attribute *a; LDAPMod **attrs; + struct berval mapped; + struct berval mdn = BER_BVNULL; + ber_int_t msgid; + dncookie dc; + int isupdate; + LDAPControl **ctrls = NULL; +#ifdef LDAP_BACK_PROXY_AUTHZ + int rc = LDAP_SUCCESS; +#endif /* LDAP_BACK_PROXY_AUTHZ */ - lc = ldap_back_getconn(li, conn, op); - if (!lc) +#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 */ + + lc = ldap_back_getconn(op, rs); + if ( !lc || !ldap_back_dobind( lc, op, rs ) ) { return( -1 ); + } - if (!lc->bound) { - ldap_back_dobind(lc, op); - if (!lc->bound) - return( -1 ); + /* + * Rewrite the add dn, if needed + */ + dc.rwmap = &li->rwmap; +#ifdef ENABLE_REWRITE + dc.conn = op->o_conn; + dc.rs = rs; + dc.ctx = "addDN"; +#else + 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; } /* Count number of attributes in entry */ - for (i=1, a=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) ; /* Create array of LDAPMods for ldap_add() */ attrs = (LDAPMod **)ch_malloc(sizeof(LDAPMod *)*i); - attrs[i-1] = 0; - for (i=0, a=e->e_attrs; a; i++, a=a->a_next) { +#ifdef ENABLE_REWRITE + dc.ctx = "addAttrDN"; +#endif + + isupdate = be_shadow_update( op ); + for (i=0, a=op->oq_add.rs_e->e_attrs; a; a=a->a_next) { + if ( !isupdate && a->a_desc->ad_type->sat_no_user_mod ) { + continue; + } + + ldap_back_map(&li->rwmap.rwm_at, &a->a_desc->ad_cname, &mapped, + BACKLDAP_MAP); + if (mapped.bv_val == NULL || mapped.bv_val[0] == '\0') { + continue; + } + attrs[i] = (LDAPMod *)ch_malloc(sizeof(LDAPMod)); + if (attrs[i] == NULL) { + continue; + } + attrs[i]->mod_op = LDAP_MOD_BVALUES; - attrs[i]->mod_type = a->a_desc->ad_cname->bv_val; - attrs[i]->mod_vals.modv_bvals = a->a_vals; + 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++); + 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; + i++; + } + attrs[i] = NULL; + + ctrls = op->o_ctrls; +#ifdef LDAP_BACK_PROXY_AUTHZ + rc = ldap_back_proxy_authz_ctrl( lc, op, rs, &ctrls ); + if ( rc != LDAP_SUCCESS ) { + goto cleanup; } +#endif /* LDAP_BACK_PROXY_AUTHZ */ + + rs->sr_err = ldap_add_ext(lc->ld, mdn.bv_val, attrs, + ctrls, NULL, &msgid); + +#ifdef LDAP_BACK_PROXY_AUTHZ +cleanup: + if ( ctrls && ctrls != op->o_ctrls ) { + free( ctrls[ 0 ] ); + free( ctrls ); + } +#endif /* LDAP_BACK_PROXY_AUTHZ */ - ldap_add_s(lc->ld, e->e_dn, attrs); - for (--i; i>= 0; --i) - free(attrs[i]); - free(attrs); - return( ldap_back_op_result( lc, op )); + for (--i; i>= 0; --i) { + ch_free(attrs[i]->mod_vals.modv_bvals); + ch_free(attrs[i]); + } + ch_free(attrs); + if ( mdn.bv_val != op->o_req_dn.bv_val ) { + free( mdn.bv_val ); + } +#ifdef LDAP_BACK_PROXY_AUTHZ + if ( rc != LDAP_SUCCESS ) { + send_ldap_result( op, rs ); + return -1; + } +#endif /* LDAP_BACK_PROXY_AUTHZ */ + return ldap_back_op_result( lc, op, rs, msgid, 1 ) != LDAP_SUCCESS; } +