error message from be_entry_put tool backend function

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

diff --git a/servers/slapd/back-ldap/modrdn.c b/servers/slapd/back-ldap/modrdn.c
index 66761c0a739de37d0b3b3ec03a9863cd63f4fe8f..2930ad9a7389caa37bee90e2e6108abd976abd67 100644 (file)
--- a/servers/slapd/back-ldap/modrdn.c
+++ b/servers/slapd/back-ldap/modrdn.c
@@ -1,7 +1,7 @@
 /* modrdn.c - ldap backend modrdn function */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* This is an altered version */
@@ -50,20 +50,22 @@ ldap_back_modrdn(
     Backend    *be,
     Connection *conn,
     Operation  *op,
-    const char *dn,
-    const char *ndn,
-    const char *newrdn,
+    struct berval      *dn,
+    struct berval      *ndn,
+    struct berval      *newrdn,
+    struct berval      *nnewrdn,
     int                deleteoldrdn,
-    const char *newSuperior
+    struct berval      *newSuperior,
+    struct berval      *nnewSuperior
 )
 {
        struct ldapinfo *li = (struct ldapinfo *) be->be_private;
        struct ldapconn *lc;
 
-       char *mdn, *mnewSuperior;
+       struct berval mdn = { 0, NULL }, mnewSuperior = { 0, NULL };
 
        lc = ldap_back_getconn( li, conn, op );
-       if ( !lc ) {
+       if ( !lc || !ldap_back_dobind(lc, op) ) {
                return( -1 );
        }
 
@@ -71,26 +73,89 @@ ldap_back_modrdn(
                int version = LDAP_VERSION3;
                ldap_set_option( lc->ld, LDAP_OPT_PROTOCOL_VERSION, &version);
                
-               mnewSuperior = ldap_back_dn_massage( li,
-                       ch_strdup( newSuperior ), 0 );
-               if ( mnewSuperior == NULL ) {
+               /*
+                * Rewrite the new superior, if defined and required
+                */
+#ifdef ENABLE_REWRITE
+               switch ( rewrite_session( li->rwinfo, "newSuperiorDn",
+                                       newSuperior->bv_val, conn, &mnewSuperior.bv_val ) ) {
+               case REWRITE_REGEXEC_OK:
+                       if ( mnewSuperior.bv_val == NULL ) {
+                               mnewSuperior.bv_val = ( char * )newSuperior;
+                       }
+#ifdef NEW_LOGGING
+                       LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+                                       "[rw] newSuperiorDn:"
+                                       " \"%s\" -> \"%s\"\n",
+                                       newSuperior, mnewSuperior.bv_val ));
+#else /* !NEW_LOGGING */
+                       Debug( LDAP_DEBUG_ARGS, "rw> newSuperiorDn:"
+                                       " \"%s\" -> \"%s\"\n%s",
+                                       newSuperior->bv_val, mnewSuperior.bv_val, "" );
+#endif /* !NEW_LOGGING */
+                       break;
+
+               case REWRITE_REGEXEC_UNWILLING:
+                       send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
+                                       NULL, "Unwilling to perform",
+                                       NULL, NULL );
+                       return( -1 );
+
+               case REWRITE_REGEXEC_ERR:
+                       send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                                       NULL, "Operations error",
+                                       NULL, NULL );
+                       return( -1 );
+               }
+#else /* !ENABLE_REWRITE */
+               ldap_back_dn_massage( li, newSuperior, &mnewSuperior, 0, 1 );
+               if ( mnewSuperior.bv_val == NULL ) {
                        return( -1 );
                }
+#endif /* !ENABLE_REWRITE */
        }
 
-       if ( !ldap_back_dobind(lc, op) ) {
+#ifdef ENABLE_REWRITE
+       /*
+        * Rewrite the modrdn dn, if required
+        */
+       switch ( rewrite_session( li->rwinfo, "modrDn", dn->bv_val, conn, &mdn.bv_val ) ) {
+       case REWRITE_REGEXEC_OK:
+               if ( mdn.bv_val == NULL ) {
+                       mdn.bv_val = ( char * )dn->bv_val;
+               }
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+                               "[rw] modrDn: \"%s\" -> \"%s\"\n", dn->bv_val, mdn.bv_val ));
+#else /* !NEW_LOGGING */
+               Debug( LDAP_DEBUG_ARGS, "rw> modrDn: \"%s\" -> \"%s\"\n%s",
+                               dn->bv_val, mdn.bv_val, "" );
+#endif /* !NEW_LOGGING */
+               break;
+               
+       case REWRITE_REGEXEC_UNWILLING:
+               send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
+                               NULL, "Unwilling to perform", NULL, NULL );
                return( -1 );
-       }
 
-       mdn = ldap_back_dn_massage( li, ch_strdup( dn ), 0 );
-       if ( mdn == NULL ) {
+       case REWRITE_REGEXEC_ERR:
+               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                               NULL, "Operations error", NULL, NULL );
                return( -1 );
        }
+#else /* !ENABLE_REWRITE */
+       ldap_back_dn_massage( li, dn, &mdn, 0, 1 );
+#endif /* !ENABLE_REWRITE */
 
-       ldap_rename2_s( lc->ld, mdn, newrdn, mnewSuperior, deleteoldrdn );
+       ldap_rename2_s( lc->ld, mdn.bv_val, newrdn->bv_val, mnewSuperior.bv_val, deleteoldrdn );
 
-       free( mdn );
-       if ( mnewSuperior ) free( mnewSuperior );
+       if ( mdn.bv_val != dn->bv_val ) {
+               free( mdn.bv_val );
+       }
+       if ( mnewSuperior.bv_val != NULL
+               && mnewSuperior.bv_val != newSuperior->bv_val ) {
+               free( mnewSuperior.bv_val );
+       }
        
        return( ldap_back_op_result( lc, op ) );
 }