X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldap%2Fadd.c;h=699503aca8e25093a511afa326f6c733a8de9b66;hb=8b954144d612e78da4c8c815007717fc9781cab6;hp=7344aa5605e51e404adf1bd6767d5336adcbe4f4;hpb=c823f9a995ce4e14dfde1eab58d224acea700e72;p=openldap

diff --git a/servers/slapd/back-ldap/add.c b/servers/slapd/back-ldap/add.c
index 7344aa5605..699503aca8 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. <hyc@highlandsun.com>
- * 
- * 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 <http://www.openldap.org/>.
  *
+ * Copyright 1999-2004 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. <ando@sys-net.it>
+ * 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
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by the Howard Chu for inclusion
+ * in OpenLDAP Software and subsequently enhanced by Pierangelo
+ * Masarati.
  */
 
 #include "portable.h"
@@ -56,9 +42,14 @@ ldap_back_add(
 	Attribute *a;
 	LDAPMod **attrs;
 	struct berval mapped;
-	struct berval mdn = { 0, NULL };
+	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 */
 
 #ifdef NEW_LOGGING
 	LDAP_LOG( BACK_LDAP, ENTRY, "ldap_back_add: %s\n", op->o_req_dn.bv_val, 0, 0 );
@@ -74,11 +65,11 @@ ldap_back_add(
 	/*
 	 * Rewrite the add dn, if needed
 	 */
-	dc.li = li;
+	dc.rwmap = &li->rwmap;
 #ifdef ENABLE_REWRITE
 	dc.conn = op->o_conn;
 	dc.rs = rs;
-	dc.ctx = "addDn";
+	dc.ctx = "addDN";
 #else
 	dc.tofrom = 1;
 	dc.normalized = 0;
@@ -98,12 +89,14 @@ ldap_back_add(
 #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 ( a->a_desc->ad_type->sat_no_user_mod  ) {
+		if ( !isupdate && a->a_desc->ad_type->sat_no_user_mod  ) {
 			continue;
 		}
 
-		ldap_back_map(&li->at_map, &a->a_desc->ad_cname, &mapped,
+		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;
@@ -135,8 +128,25 @@ ldap_back_add(
 	}
 	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,
-			op->o_ctrls, NULL, &msgid);
+			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 */
+
 	for (--i; i>= 0; --i) {
 		ch_free(attrs[i]->mod_vals.modv_bvals);
 		ch_free(attrs[i]);
@@ -145,27 +155,12 @@ ldap_back_add(
 	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;
 }
 
-int
-ldap_dnattr_rewrite(
-	dncookie		*dc,
-	BerVarray		a_vals
-)
-{
-	struct berval bv;
-
-	for ( ; a_vals->bv_val != NULL; a_vals++ ) {
-		ldap_back_dn_massage( dc, a_vals, &bv );
-
-		/* leave attr untouched if massage failed */
-		if ( bv.bv_val && bv.bv_val != a_vals->bv_val ) {
-			ch_free( a_vals->bv_val );
-			*a_vals = bv;
-		}
-	}
-	
-	return 0;
-}