Fix memory leak.

[openldap] / servers / slapd / modrdn.c

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index 78b56666d5f9ff10274be16009b057dc1b5ba6dc..11434c9635ed02ea5559a4dde181e7e981c1ca0b 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
@@ -44,7 +44,7 @@ do_modrdn(
     Operation  *op
 )
 {
-       char    *dn, *ndn, *newrdn;
+       char    *dn, *ndn = NULL, *newrdn;
        ber_int_t       deloldrdn;
        Backend *be;
        /* Vars for LDAP v3 newSuperior support */
@@ -53,17 +53,10 @@ do_modrdn(
        Backend *newSuperior_be = NULL;
        ber_len_t       length;
        int rc;
+       const char *text;
 
        Debug( LDAP_DEBUG_TRACE, "do_modrdn\n", 0, 0, 0 );
 
-       if( op->o_bind_in_progress ) {
-               Debug( LDAP_DEBUG_ANY, "do_modrdn: SASL bind in progress.\n",
-                       0, 0, 0 );
-               send_ldap_result( conn, op, LDAP_SASL_BIND_IN_PROGRESS,
-                       NULL, "SASL bind in progress", NULL, NULL );
-               return LDAP_SASL_BIND_IN_PROGRESS;
-       }
-
        /*
         * Parse the modrdn request.  It looks like this:
         *
@@ -116,7 +109,7 @@ do_modrdn(
                        Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid new superior (%s)\n",
                                newSuperior, 0, 0 );
                        send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
-                               "invalid (new superior) DN", NULL, NULL );
+                               "invalid new superior DN", NULL, NULL );
                        goto cleanup;
                }
 
@@ -173,11 +166,11 @@ do_modrdn(
        }
 
        /* make sure this backend recongizes critical controls */
-       rc = backend_check_controls( be, conn, op ) ;
+       rc = backend_check_controls( be, conn, op, &text ) ;
 
        if( rc != LDAP_SUCCESS ) {
                send_ldap_result( conn, op, rc,
-                       NULL, NULL, NULL, NULL );
+                       NULL, text, NULL, NULL );
                goto cleanup;
        }
 
@@ -200,7 +193,7 @@ do_modrdn(
                        rc = LDAP_AFFECTS_MULTIPLE_DSAS;
 
                        send_ldap_result( conn, op, rc,
-                               NULL, NULL, NULL, NULL );
+                               NULL, "cannot rename between DSAa", NULL, NULL );
 
                        goto cleanup;
                }
@@ -247,12 +240,12 @@ do_modrdn(
                }
        } else {
                send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-                       NULL, "Function not implemented", NULL, NULL );
+                       NULL, "operation not supported within namingContext", NULL, NULL );
        }
 
 cleanup:
        free( dn );
-       free( ndn );
+       if( ndn != NULL ) free( ndn );
        free( newrdn ); 
        if ( newSuperior != NULL )
                free( newSuperior );