/* $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
*/
/*
Operation *op
)
{
- char *dn, *ndn, *newrdn;
+ char *dn, *ndn = NULL, *newrdn;
ber_int_t deloldrdn;
Backend *be;
/* Vars for LDAP v3 newSuperior support */
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:
*
Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
send_ldap_disconnect( conn, op,
LDAP_PROTOCOL_ERROR, "decoding error" );
- return -1;
- }
-
- ndn = ch_strdup( dn );
-
- if( dn_normalize( ndn ) == NULL ) {
- Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid dn (%s)\n", dn, 0, 0 );
- send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
- "invalid DN", NULL, NULL );
- goto cleanup;
- }
-
- if( !rdn_validate( newrdn ) ) {
- Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid rdn (%s)\n", newrdn, 0, 0 );
- send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
- "invalid RDN", NULL, NULL );
- goto cleanup;
+ return SLAPD_DISCONNECT;
}
/* Check for newSuperior parameter, if present scan it */
0, 0, 0 );
send_ldap_disconnect( conn, op,
LDAP_PROTOCOL_ERROR, "newSuperior requires LDAPv3" );
- rc = -1;
+ rc = SLAPD_DISCONNECT;
goto cleanup;
}
0, 0, 0 );
send_ldap_disconnect( conn, op,
LDAP_PROTOCOL_ERROR, "decoding error" );
- rc = -1;
+ rc = SLAPD_DISCONNECT;
goto cleanup;
}
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;
}
Debug( LDAP_DEBUG_ANY, "do_modrdn: ber_scanf failed\n", 0, 0, 0 );
send_ldap_disconnect( conn, op,
LDAP_PROTOCOL_ERROR, "decoding error" );
- rc = -1;
+ rc = SLAPD_DISCONNECT;
goto cleanup;
}
goto cleanup;
}
+ ndn = ch_strdup( dn );
+
+ if( dn_normalize( ndn ) == NULL ) {
+ Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid dn (%s)\n", dn, 0, 0 );
+ send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
+ "invalid DN", NULL, NULL );
+ goto cleanup;
+ }
+
+ if( !rdn_validate( newrdn ) ) {
+ Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid rdn (%s)\n", newrdn, 0, 0 );
+ send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
+ "invalid RDN", NULL, NULL );
+ goto cleanup;
+ }
+
Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d MODRDN dn=\"%s\"\n",
op->o_connid, op->o_opid, dn, 0, 0 );
}
/* 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;
}
rc = LDAP_AFFECTS_MULTIPLE_DSAS;
send_ldap_result( conn, op, rc,
- NULL, NULL, NULL, NULL );
+ NULL, "cannot rename between DSAa", NULL, NULL );
goto cleanup;
}
}
} 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 );