Clear ocflags

[openldap] / servers / slapd / back-ldap / modify.c

diff --git a/servers/slapd/back-ldap/modify.c b/servers/slapd/back-ldap/modify.c
index 2e1e61a8aba0f3d363d682196fbf9df0786a503a..c6a45a8e9856ee0e4d7c5932b7615bfedbf39d0d 100644 (file)
--- 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-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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
+ * <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.
  */
 /* This is an altered version */
 /*
@@ -60,6 +74,9 @@ ldap_back_modify(
        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 ) ) {
@@ -69,7 +86,7 @@ ldap_back_modify(
        /*
         * Rewrite the modify dn, if needed
         */
-       dc.li = li;
+       dc.rwmap = &li->rwmap;
 #ifdef ENABLE_REWRITE
        dc.conn = op->o_conn;
        dc.rs = rs;
@@ -97,33 +114,68 @@ ldap_back_modify(
                goto cleanup;
        }
 
+#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;
                }
 
-               ldap_back_map(&li->at_map, &ml->sml_desc->ad_cname, &mapped,
-                               BACKLDAP_MAP);
-               if (mapped.bv_val == NULL || mapped.bv_val[0] == '\0') {
-                       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.bv_val;
 
-               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 ) {
+                       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;
+                       }
 
-               if ( ml->sml_bvalues != NULL ) {        
-                       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;
                }
@@ -132,10 +184,29 @@ ldap_back_modify(
        }
        modv[i] = 0;
 
+#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,
-                       op->o_ctrls, NULL, &msgid );
+#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 );
        }
@@ -145,6 +216,13 @@ cleanup:;
        ch_free( mods );
        ch_free( modv );
 
+#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 );
 }