static void modlist_free(LDAPModList *ml);
-void
+int
do_modify(
Connection *conn,
Operation *op
LDAPModList *tmp;
#endif
Backend *be;
+ int rc;
Debug( LDAP_DEBUG_TRACE, "do_modify\n", 0, 0, 0 );
+ if( op->o_bind_in_progress ) {
+ Debug( LDAP_DEBUG_ANY, "do_modify: 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 modify request. It looks like this:
*
*/
if ( ber_scanf( op->o_ber, "{a" /*}*/, &ndn ) == LBER_ERROR ) {
- Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
- send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL, "" );
- return;
+ Debug( LDAP_DEBUG_ANY, "do_modify: ber_scanf failed\n", 0, 0, 0 );
+ send_ldap_disconnect( conn, op,
+ LDAP_PROTOCOL_ERROR, "decoding error" );
+ return -1;
}
Debug( LDAP_DEBUG_ARGS, "do_modify: dn (%s)\n", ndn, 0, 0 );
- (void) dn_normalize_case( ndn );
+ if( dn_normalize_case( ndn ) == NULL ) {
+ Debug( LDAP_DEBUG_ANY, "do_modify: invalid dn (%s)\n", ndn, 0, 0 );
+ send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
+ "invalid DN", NULL, NULL );
+ free( ndn );
+ return rc;
+ }
/* collect modifications & save for later */
modlist = NULL;
&(*modtail)->ml_type, &(*modtail)->ml_bvalues )
== LBER_ERROR )
{
- send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL,
- "decoding error" );
+ send_ldap_disconnect( conn, op,
+ LDAP_PROTOCOL_ERROR, "decoding modlist error" );
free( ndn );
free( *modtail );
*modtail = NULL;
modlist_free( modlist );
- return;
+ return -1;
}
(*modtail)->ml_op = mop;
(*modtail)->ml_op != LDAP_MOD_DELETE &&
(*modtail)->ml_op != LDAP_MOD_REPLACE )
{
- send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL,
- "unrecognized modify operation" );
+ send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR,
+ NULL, "unrecognized modify operation", NULL, NULL );
free( ndn );
modlist_free( modlist );
- return;
+ return LDAP_PROTOCOL_ERROR;
}
if ( (*modtail)->ml_bvalues == NULL
&& (*modtail)->ml_op != LDAP_MOD_DELETE )
{
- send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR, NULL,
- "no values given" );
+ send_ldap_result( conn, op, LDAP_PROTOCOL_ERROR,
+ NULL, "unrecognized modify operation", NULL, NULL );
free( ndn );
modlist_free( modlist );
- return;
+ return LDAP_PROTOCOL_ERROR;
}
attr_normalize( (*modtail)->ml_type );
}
#endif
-#ifdef GET_CTRLS
- if( get_ctrls( conn, op, 1 ) == -1 ) {
+ if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
free( ndn );
modlist_free( modlist );
Debug( LDAP_DEBUG_ANY, "do_modify: get_ctrls failed\n", 0, 0, 0 );
- return;
+ return rc;
}
-#endif
Statslog( LDAP_DEBUG_STATS, "conn=%d op=%d MOD dn=\"%s\"\n",
- conn->c_connid, op->o_opid, ndn, 0, 0 );
+ op->o_connid, op->o_opid, ndn, 0, 0 );
/*
* We could be serving multiple database backends. Select the
if ( (be = select_backend( ndn )) == NULL ) {
free( ndn );
modlist_free( modlist );
- send_ldap_result( conn, op, LDAP_PARTIAL_RESULTS, NULL,
- default_referral );
- return;
+ send_ldap_result( conn, op, rc = LDAP_REFERRAL,
+ NULL, NULL, default_referral, NULL );
+ return rc;
}
- /* alias suffix if approp */
- ndn = suffixAlias ( ndn, op, be );
-
/*
* do the modify if 1 && (2 || 3)
* 1) there is a modify function implemented in this backend;
/* send a referral */
} else {
- send_ldap_result( conn, op, LDAP_PARTIAL_RESULTS, NULL,
- default_referral );
+ send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
+ be->be_update_refs ? be->be_update_refs : default_referral, NULL );
}
} else {
- send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
- "Function not implemented" );
+ send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+ NULL, "Function not implemented", NULL, NULL );
}
free( ndn );
modlist_free( modlist );
+ return rc;
}
static void