X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmodify.c;h=2bf8ce5a5c21012a62299c0db94a60e6dc19b185;hb=f491c89387cb7050246121bf5b6bf92c4df9c32c;hp=5722c82ced80dd59395abbacbd51b101865b0b14;hpb=f9db1ea88905734aef29cac9eb6bfffd5420e14e;p=openldap

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 5722c82ced..2bf8ce5a5c 100644
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -22,7 +22,7 @@
 
 static void	modlist_free(LDAPModList *ml);
 
-void
+int
 do_modify(
     Connection	*conn,
     Operation	*op
@@ -38,9 +38,18 @@ do_modify(
 	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:
 	 *
@@ -61,14 +70,21 @@ do_modify(
 	 */
 
 	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;
@@ -86,13 +102,13 @@ do_modify(
 		    &(*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;
@@ -101,21 +117,21 @@ do_modify(
 		    (*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 );
 
@@ -133,17 +149,15 @@ do_modify(
 	}
 #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
@@ -153,14 +167,11 @@ do_modify(
 	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;
@@ -178,16 +189,17 @@ do_modify(
 
 		/* 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