+ /* FIXME: should have/use rdnPretty / rdnNormalize routines */
+
+ rc = dnPrettyNormal( NULL, &newrdn, &pnewrdn, &nnewrdn );
+ if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+ "do_modrdn: conn %d invalid newrdn (%s)\n",
+ conn->c_connid, newrdn.bv_val ));
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "do_modrdn: invalid newrdn (%s)\n", newrdn.bv_val, 0, 0 );
+#endif
+ send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
+ "invalid new RDN", NULL, NULL );
+ goto cleanup;
+ }
+
+ if( rdnValidate( &pnewrdn ) != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "do_modrdn: invalid rdn (%s).\n", pnewrdn.bv_val ));
+#else
+ Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid rdn (%s)\n",
+ pnewrdn.bv_val, 0, 0 );
+#endif
+
+ send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
+ "invalid new RDN", NULL, NULL );
+ goto cleanup;
+ }
+
+ if( pnewS ) {
+ rc = dnPrettyNormal( NULL, &newSuperior, &pnewSuperior,
+ &nnewSuperior );
+ if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+ "do_modrdn: conn %d invalid newSuperior (%s)\n",
+ conn->c_connid, newSuperior.bv_val ));
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "do_modrdn: invalid newSuperior (%s)\n",
+ newSuperior.bv_val, 0, 0 );
+#endif
+ send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
+ "invalid newSuperior", NULL, NULL );
+ goto cleanup;
+ }
+ }
+