Do not return pointers into BerElement we do not own

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

diff --git a/servers/slapd/back-meta/modrdn.c b/servers/slapd/back-meta/modrdn.c
index 3528a52072b00c4b525ea8cf967896bc17740594..34cfebfe9691543a0be72b625a6ceaea240ae41f 100644 (file)
--- a/servers/slapd/back-meta/modrdn.c
+++ b/servers/slapd/back-meta/modrdn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1998-2001 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  *
  * Copyright 2001, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
@@ -80,11 +80,13 @@ meta_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 metainfo *li = ( struct metainfo * )be->be_private;
@@ -95,7 +97,10 @@ meta_back_modrdn(
 
        lc = meta_back_getconn( li, conn, op, META_OP_REQUIRE_SINGLE,
                        ndn, &candidate );
-       if ( !lc || !meta_back_dobind( lc, op ) ) {
+       if ( !lc || !meta_back_dobind( lc, op ) 
+                       || !meta_back_is_valid( lc, candidate ) ) {
+               send_ldap_result( conn, op, LDAP_OTHER,
+                               NULL, NULL, NULL, NULL );
                return -1;
        }
 
@@ -123,7 +128,7 @@ meta_back_modrdn(
                        return -1;
                }
 
-               ldap_set_option( lc->conns[ nsCandidate ]->ld,
+               ldap_set_option( lc->conns[ nsCandidate ].ld,
                                LDAP_OPT_PROTOCOL_VERSION, &version );
                
                /*
@@ -131,31 +136,33 @@ meta_back_modrdn(
                 */
                switch ( rewrite_session( li->targets[ nsCandidate ]->rwinfo,
                                        "newSuperiorDn",
-                                       newSuperior, conn, &mnewSuperior ) ) {
+                                       newSuperior->bv_val, 
+                                       conn, 
+                                       &mnewSuperior ) ) {
                case REWRITE_REGEXEC_OK:
                        if ( mnewSuperior == NULL ) {
                                mnewSuperior = ( char * )newSuperior;
                        }
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                                       "[rw] newSuperiorDn:"
-                                       " \"%s\" -> \"%s\"\n",
-                                       newSuperior, mnewSuperior ));
+                       LDAP_LOG( BACK_META, DETAIL1,
+                               "[rw] newSuperiorDn: \"%s\" -> \"%s\"\n",
+                               newSuperior, mnewSuperior, 0 );
 #else /* !NEW_LOGGING */
                        Debug( LDAP_DEBUG_ARGS, "rw> newSuperiorDn:"
                                        " \"%s\" -> \"%s\"\n%s",
-                                       newSuperior, mnewSuperior, "" );
+                                       newSuperior->bv_val, mnewSuperior, "" );
 #endif /* !NEW_LOGGING */
                        break;
 
                case REWRITE_REGEXEC_UNWILLING:
                        send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
-                                       NULL, NULL, NULL, NULL );
+                                       NULL, "Operation not allowed", 
+                                       NULL, NULL );
                        return -1;
 
                case REWRITE_REGEXEC_ERR:
-                       send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-                                       NULL, NULL, NULL, NULL );
+                       send_ldap_result( conn, op, LDAP_OTHER,
+                                       NULL, "Rewrite error", NULL, NULL );
                        return -1;
                }
        }
@@ -164,39 +171,38 @@ meta_back_modrdn(
         * Rewrite the modrdn dn, if required
         */
        switch ( rewrite_session( li->targets[ candidate ]->rwinfo,
-                               "modrDn", dn, conn, &mdn ) ) {
+                               "modrDn", dn->bv_val, conn, &mdn ) ) {
        case REWRITE_REGEXEC_OK:
                if ( mdn == NULL ) {
-                       mdn = ( char * )dn;
+                       mdn = ( char * )dn->bv_val;
                }
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                               "[rw] modrDn: \"%s\" -> \"%s\"\n",
-                               dn, mdn ));
+               LDAP_LOG( BACK_META, DETAIL1,
+                       "[rw] modrDn: \"%s\" -> \"%s\"\n", dn->bv_val, mdn, 0 );
 #else /* !NEW_LOGGING */
                Debug( LDAP_DEBUG_ARGS, "rw> modrDn: \"%s\" -> \"%s\"\n%s",
-                               dn, mdn, "" );
+                               dn->bv_val, mdn, "" );
 #endif /* !NEW_LOGGING */
                break;
                
        case REWRITE_REGEXEC_UNWILLING:
                send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
-                               NULL, NULL, NULL, NULL );
+                               NULL, "Operation not allowed", NULL, NULL );
                return -1;
 
        case REWRITE_REGEXEC_ERR:
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-                               NULL, NULL, NULL, NULL );
+               send_ldap_result( conn, op, LDAP_OTHER,
+                               NULL, "Rewrite error", NULL, NULL );
                return -1;
        }
 
-       ldap_rename2_s( lc->conns[ candidate ]->ld, mdn, newrdn,
+       ldap_rename2_s( lc->conns[ candidate ].ld, mdn, newrdn->bv_val,
                        mnewSuperior, deleteoldrdn );
 
-       if ( mdn != dn ) {
+       if ( mdn != dn->bv_val ) {
                free( mdn );
        }
-       if ( mnewSuperior != NULL && mnewSuperior != newSuperior ) {
+       if ( mnewSuperior != NULL && mnewSuperior != newSuperior->bv_val ) {
                free( mnewSuperior );
        }