X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-meta%2Fadd.c;h=02ef16770d8906d2b19b281f83651f0a907e1bb4;hb=b34cf024884cf35572d98164381537f256b6dfee;hp=1b25546d9e87339feb975f712953a1b89f1ae008;hpb=6939c531700652491f4be4688c6a1f35a1ab8a18;p=openldap
diff --git a/servers/slapd/back-meta/add.c b/servers/slapd/back-meta/add.c
index 1b25546d9e..02ef16770d 100644
--- a/servers/slapd/back-meta/add.c
+++ b/servers/slapd/back-meta/add.c
@@ -1,67 +1,23 @@
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
*
- * Copyright 2001, Pierangelo Masarati, All rights reserved.
+ * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Portions Copyright 2001-2003 Pierangelo Masarati.
+ * Portions Copyright 1999-2003 Howard Chu.
+ * All rights reserved.
*
- * This work has been developed to fulfill the requirements
- * of SysNet s.n.c. and it has been donated
- * to the OpenLDAP Foundation in the hope that it may be useful
- * to the Open Source community, but WITHOUT ANY WARRANTY.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
*
- * 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 and SysNet s.n.c. are 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.
- * SysNet s.n.c. cannot be responsible for the consequences of the
- * alterations.
- *
- * 4. This notice may not be removed or altered.
- *
- *
- * This software is based on the backend back-ldap, implemented
- * by Howard Chu , and modified by Mark Valence
- * , Pierangelo Masarati and other
- * contributors. The contribution of the original software to the present
- * implementation is acknowledged in this copyright statement.
- *
- * A special acknowledgement goes to Howard for the overall architecture
- * (and for borrowing large pieces of code), and to Mark, who implemented
- * from scratch the attribute/objectclass mapping.
- *
- * The original copyright statement follows.
- *
- * 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.
- *
+ * 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.
*/
@@ -77,85 +33,69 @@
#include "back-meta.h"
int
-meta_back_add(
- Backend *be,
- Connection *conn,
- Operation *op,
- Entry *e
-)
+meta_back_add( Operation *op, SlapReply *rs )
{
- struct metainfo *li = ( struct metainfo * )be->be_private;
+ struct metainfo *li = ( struct metainfo * )op->o_bd->be_private;
struct metaconn *lc;
int i, candidate = -1;
Attribute *a;
LDAPMod **attrs;
- struct berval mdn = { 0, NULL }, mapped;
+ struct berval mdn = BER_BVNULL, mapped;
+ dncookie dc;
#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, ENTRY, "meta_back_add: %s\n", e->e_dn, 0, 0 );
+ LDAP_LOG( BACK_META, ENTRY, "meta_back_add: %s\n",
+ op->o_req_dn.bv_val, 0, 0 );
#else /* !NEW_LOGGING */
- Debug(LDAP_DEBUG_ARGS, "==> meta_back_add: %s\n%s%s", e->e_dn, "", "");
+ Debug(LDAP_DEBUG_ARGS, "==> meta_back_add: %s\n",
+ op->o_req_dn.bv_val, 0, 0 );
#endif /* !NEW_LOGGING */
/*
* get the current connection
*/
- lc = meta_back_getconn( li, conn, op, META_OP_REQUIRE_SINGLE,
- &e->e_nname, &candidate );
- if ( !lc || !meta_back_dobind( lc, op ) || !meta_back_is_valid( lc, candidate ) ) {
- send_ldap_result( conn, op, LDAP_OTHER,
- NULL, NULL, NULL, NULL );
+ lc = meta_back_getconn( op, rs, META_OP_REQUIRE_SINGLE,
+ &op->o_req_ndn, &candidate );
+ if ( !lc ) {
+ send_ldap_result( op, rs );
+ }
+
+ if ( !meta_back_dobind( lc, op )
+ || !meta_back_is_valid( lc, candidate ) ) {
+ rs->sr_err = LDAP_OTHER;
+ send_ldap_result( op, rs );
return -1;
}
/*
* Rewrite the add dn, if needed
*/
- switch ( rewrite_session( li->targets[ candidate ]->rwinfo,
- "addDn", e->e_dn, conn, &mdn.bv_val )) {
- case REWRITE_REGEXEC_OK:
- if ( mdn.bv_val != NULL && mdn.bv_val[ 0 ] != '\0' ) {
- mdn.bv_len = strlen( mdn.bv_val );
- } else {
- mdn = e->e_name;
- }
+ dc.rwmap = &li->targets[ candidate ]->rwmap;
+ dc.conn = op->o_conn;
+ dc.rs = rs;
+ dc.ctx = "addDN";
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_META, DETAIL1,
- "[rw] addDn: \"%s\" -> \"%s\"\n", e->e_dn, mdn.bv_val, 0 );
-#else /* !NEW_LOGGING */
- Debug( LDAP_DEBUG_ARGS, "rw> addDn: \"%s\" -> \"%s\"\n%s",
- e->e_dn, mdn.bv_val, "" );
-#endif /* !NEW_LOGGING */
- break;
-
- case REWRITE_REGEXEC_UNWILLING:
- send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
- NULL, "Operation not allowed", NULL, NULL );
- return -1;
-
- case REWRITE_REGEXEC_ERR:
- send_ldap_result( conn, op, LDAP_OTHER,
- NULL, "Rewrite error", NULL, NULL );
+ 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 = ch_malloc( sizeof( LDAPMod * )*i );
- for ( i = 0, a = e->e_attrs; a; a = a->a_next ) {
+ for ( i = 0, a = op->oq_add.rs_e->e_attrs; a; a = a->a_next ) {
int j;
if ( a->a_desc->ad_type->sat_no_user_mod ) {
continue;
}
- ldap_back_map( &li->targets[ candidate ]->at_map,
- &a->a_desc->ad_cname, &mapped, 0);
- if ( mapped.bv_val == NULL ) {
+ ldap_back_map( &li->targets[ candidate ]->rwmap.rwm_at,
+ &a->a_desc->ad_cname, &mapped, BACKLDAP_MAP );
+ if ( mapped.bv_val == NULL || mapped.bv_val[0] == '\0' ) {
continue;
}
@@ -173,14 +113,14 @@ meta_back_add(
*/
if ( strcmp( a->a_desc->ad_type->sat_syntax->ssyn_oid,
SLAPD_DN_SYNTAX ) == 0 ) {
- ldap_dnattr_rewrite( li->targets[ candidate ]->rwinfo,
- a->a_vals, conn );
+ (void)ldap_dnattr_rewrite( &dc, a->a_vals );
}
- for (j=0; a->a_vals[ j ].bv_val; 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++)
+ 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++;
}
@@ -192,9 +132,9 @@ meta_back_add(
free( attrs[ i ] );
}
free( attrs );
- if ( mdn.bv_val != e->e_dn ) {
+ if ( mdn.bv_val != op->oq_add.rs_e->e_dn ) {
free( mdn.bv_val );
}
- return meta_back_op_result( lc, op );
+ return meta_back_op_result( lc, op, rs );
}