X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldap%2Fmodify.c;h=c6a45a8e9856ee0e4d7c5932b7615bfedbf39d0d;hb=c59e89de2f86cd319b02b9344a856ff0c0d55582;hp=269ebf459114f06ad59dfddc9f68ffc66db74b7f;hpb=74fa239a201cd2d785fe34bdbaf6804161bdb231;p=openldap
diff --git a/servers/slapd/back-ldap/modify.c b/servers/slapd/back-ldap/modify.c
index 269ebf4591..c6a45a8e98 100644
--- a/servers/slapd/back-ldap/modify.c
+++ b/servers/slapd/back-ldap/modify.c
@@ -1,8 +1,22 @@
/* modify.c - ldap backend modify function */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 2003 The OpenLDAP Foundation.
+ * 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.
*/
/* This is an altered version */
/*
@@ -47,103 +61,168 @@
int
ldap_back_modify(
- Backend *be,
- Connection *conn,
Operation *op,
- const char *dn,
- const char *ndn,
- Modifications *modlist
-)
+ SlapReply *rs )
{
- struct ldapinfo *li = (struct ldapinfo *) be->be_private;
+ struct ldapinfo *li = (struct ldapinfo *) op->o_bd->be_private;
struct ldapconn *lc;
- LDAPMod **modv;
+ LDAPMod **modv = NULL;
LDAPMod *mods;
Modifications *ml;
- int i;
- char *mdn = NULL, *mapped;
-
- lc = ldap_back_getconn(li, conn, op);
- if ( !lc || !ldap_back_dobind( lc, op ) ) {
+ int i, j, rc;
+ struct berval mapped;
+ struct berval mdn = { 0, NULL };
+ ber_int_t msgid;
+ dncookie dc;
+#ifdef LDAP_BACK_PROXY_AUTHZ
+ LDAPControl **ctrls = NULL;
+#endif /* LDAP_BACK_PROXY_AUTHZ */
+
+ lc = ldap_back_getconn(op, rs);
+ if ( !lc || !ldap_back_dobind( lc, op, rs ) ) {
return( -1 );
}
/*
* Rewrite the modify dn, if needed
*/
+ dc.rwmap = &li->rwmap;
#ifdef ENABLE_REWRITE
- switch ( rewrite_session( li->rwinfo, "modifyDn", dn, conn, &mdn ) ) {
- case REWRITE_REGEXEC_OK:
- if ( mdn == NULL ) {
- mdn = ( char * )dn;
- }
- Debug( LDAP_DEBUG_ARGS, "rw> modifyDN: \"%s\" -> \"%s\"\n%s",
- dn, mdn, "" );
- break;
-
- case REWRITE_REGEXEC_UNWILLING:
- send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
- NULL, "Unwilling to perform", NULL, NULL );
-
- case REWRITE_REGEXEC_ERR:
- return( -1 );
+ dc.conn = op->o_conn;
+ dc.rs = rs;
+ dc.ctx = "modifyDn";
+#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;
}
-#else /* !ENABLE_REWRITE */
- mdn = ldap_back_dn_massage( li, ch_strdup( dn ), 0 );
-#endif /* !ENABLE_REWRITE */
- for (i=0, ml=modlist; ml; i++,ml=ml->sml_next)
+ for (i=0, ml=op->oq_modify.rs_modlist; ml; i++,ml=ml->sml_next)
;
mods = (LDAPMod *)ch_malloc(i*sizeof(LDAPMod));
if (mods == NULL) {
+ rc = LDAP_NO_MEMORY;
goto cleanup;
}
modv = (LDAPMod **)ch_malloc((i+1)*sizeof(LDAPMod *));
if (modv == NULL) {
+ rc = LDAP_NO_MEMORY;
goto cleanup;
}
- for (i=0, ml=modlist; ml; ml=ml->sml_next) {
- mapped = ldap_back_map(&li->at_map, ml->sml_desc->ad_cname->bv_val, 0);
- if (mapped == NULL) {
+#ifdef ENABLE_REWRITE
+ dc.ctx = "modifyAttrDN";
+#endif
+ for (i=0, ml=op->oq_modify.rs_modlist; ml; ml=ml->sml_next) {
+ int is_oc = 0;
+
+ if ( ml->sml_desc->ad_type->sat_no_user_mod ) {
continue;
}
+ if ( ml->sml_desc == slap_schema.si_ad_objectClass
+ || ml->sml_desc == slap_schema.si_ad_structuralObjectClass ) {
+ is_oc = 1;
+ mapped = ml->sml_desc->ad_cname;
+
+ } else {
+ ldap_back_map(&li->rwmap.rwm_at,
+ &ml->sml_desc->ad_cname,
+ &mapped, BACKLDAP_MAP);
+ if (mapped.bv_val == NULL || mapped.bv_val[0] == '\0') {
+ continue;
+ }
+ }
+
modv[i] = &mods[i];
mods[i].mod_op = ml->sml_op | LDAP_MOD_BVALUES;
- mods[i].mod_type = mapped;
-
-#ifdef ENABLE_REWRITE
- /*
- * FIXME: dn-valued attrs should be rewritten
- * to allow their use in ACLs at the back-ldap
- * level.
- */
- if ( strcmp( ml->sml_desc->ad_type->sat_syntax->ssyn_oid,
- SLAPD_DN_SYNTAX ) == 0 ) {
- ldap_dnattr_rewrite( li->rwinfo,
- ml->sml_bvalues, conn );
+ mods[i].mod_type = mapped.bv_val;
+
+ if ( ml->sml_bvalues != NULL ) {
+ if ( is_oc ) {
+ for (j = 0; ml->sml_bvalues[j].bv_val; j++);
+ mods[i].mod_bvalues = (struct berval **)ch_malloc((j+1) *
+ sizeof(struct berval *));
+ for (j = 0; ml->sml_bvalues[j].bv_val; j++) {
+ ldap_back_map(&li->rwmap.rwm_oc,
+ &ml->sml_bvalues[j],
+ &mapped, BACKLDAP_MAP);
+ if (mapped.bv_val == NULL || mapped.bv_val[0] == '\0') {
+ continue;
+ }
+ mods[i].mod_bvalues[j] = &mapped;
+ }
+ mods[i].mod_bvalues[j] = NULL;
+
+ } else {
+ if ( ml->sml_desc->ad_type->sat_syntax ==
+ slap_schema.si_syn_distinguishedName ) {
+ ldap_dnattr_rewrite( &dc, ml->sml_bvalues );
+ }
+
+ if ( ml->sml_bvalues == NULL ) {
+ continue;
+ }
+
+ for (j = 0; ml->sml_bvalues[j].bv_val; j++);
+ mods[i].mod_bvalues = (struct berval **)ch_malloc((j+1) *
+ sizeof(struct berval *));
+ for (j = 0; ml->sml_bvalues[j].bv_val; j++)
+ mods[i].mod_bvalues[j] = &ml->sml_bvalues[j];
+ mods[i].mod_bvalues[j] = NULL;
+ }
+
+ } else {
+ mods[i].mod_bvalues = NULL;
}
-#endif /* ENABLE_REWRITE */
-
- mods[i].mod_bvalues = ml->sml_bvalues;
+
i++;
}
modv[i] = 0;
- ldap_modify_s( lc->ld, mdn, modv );
+#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_modify_ext( lc->ld, mdn.bv_val, modv,
+#ifdef LDAP_BACK_PROXY_AUTHZ
+ ctrls,
+#else /* ! LDAP_BACK_PROXY_AUTHZ */
+ op->o_ctrls,
+#endif /* ! LDAP_BACK_PROXY_AUTHZ */
+ NULL, &msgid );
+
+cleanup:;
+#ifdef LDAP_BACK_PROXY_AUTHZ
+ if ( ctrls && ctrls != op->o_ctrls ) {
+ free( ctrls[ 0 ] );
+ free( ctrls );
+ }
+#endif /* LDAP_BACK_PROXY_AUTHZ */
+
+ if ( mdn.bv_val != op->o_req_dn.bv_val ) {
+ free( mdn.bv_val );
+ }
+ for (i=0; modv[i]; i++) {
+ ch_free(modv[i]->mod_bvalues);
+ }
+ ch_free( mods );
+ ch_free( modv );
-cleanup:
-#ifdef ENABLE_REWRITE
- if ( mdn != dn ) {
-#endif /* ENABLE_REWRITE */
- free( mdn );
-#ifdef ENABLE_REWRITE
+#ifdef LDAP_BACK_PROXY_AUTHZ
+ if ( rc != LDAP_SUCCESS ) {
+ send_ldap_result( op, rs );
+ return -1;
}
-#endif /* ENABLE_REWRITE */
- free(mods);
- free(modv);
- return( ldap_back_op_result( lc, op ));
+#endif /* LDAP_BACK_PROXY_AUTHZ */
+
+ return ldap_back_op_result( lc, op, rs, msgid, 1 );
}