Sync with HEAD

[openldap] / servers / slapd / add.c

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index da0ae87789e1e80a7f817bfd2196231236fed38e..db2b0743ba93db6ac0d8ed50b2fc490472477be6 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -82,7 +82,7 @@ do_add( Operation *op, SlapReply *rs )
                Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
 #endif
                send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
-               return -1;
+               return SLAPD_DISCONNECT;
        }
 
        e = (Entry *) ch_calloc( 1, sizeof(Entry) );
@@ -125,12 +125,12 @@ do_add( Operation *op, SlapReply *rs )
                if ( rtag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
                        LDAP_LOG( OPERATION, ERR, 
-                                  "do_add: conn %d      decoding error \n", op->o_connid, 0, 0 );
+                               "do_add: conn %d decoding error \n", op->o_connid, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY, "do_add: decoding error\n", 0, 0, 0 );
 #endif
                        send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
-                       rs->sr_err = -1;
+                       rs->sr_err = SLAPD_DISCONNECT;
                        goto done;
                }
 
@@ -168,7 +168,7 @@ do_add( Operation *op, SlapReply *rs )
                Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
 #endif
                send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
-               rs->sr_err = -1;
+               rs->sr_err = SLAPD_DISCONNECT;
                goto done;
        }
 
@@ -383,7 +383,6 @@ do_add( Operation *op, SlapReply *rs )
 #endif /* LDAP_SLAPI */
 
 done:
-
        slap_graduate_commit_csn( op );
 
        if( modlist != NULL ) {