Didn't return after returning unknown critical control.

Noticed that abandon and unbind don't have control support... something for
another day.

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 8aafe94d55172df1c0314b0adeed21219ed90a8d..8fef1b17b3b97d0b128d4b048c731950c1b55499 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -153,6 +153,8 @@ do_add( Connection *conn, Operation *op )
        if( rc != LDAP_SUCCESS ) {
                send_ldap_result( conn, op, rc,
                        NULL, NULL, NULL, NULL );
+               entry_free( e );
+               return rc;
        }
 
        if ( global_readonly || be->be_readonly ) {

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index 881c2c773306b186b1e47ed614a7885056d0ad26..096dc6b038dafd021902a565f6905046d74b3453 100644 (file)
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -290,6 +290,7 @@ do_bind(
        if( rc != LDAP_SUCCESS ) {
                send_ldap_result( conn, op, rc,
                        NULL, NULL, NULL, NULL );
+               goto cleanup;
        }
 
        if ( be->be_bind ) {

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index 89bf6a0a1b05cf0a5f71ca756bb7de2d754e4fbc..aa421fee0c6613b05dfb81473bb9e1279ce14c98 100644 (file)
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -116,6 +116,7 @@ do_compare(
        if( rc != LDAP_SUCCESS ) {
                send_ldap_result( conn, op, rc,
                        NULL, NULL, NULL, NULL );
+               goto cleanup;
        }
 
        /* deref suffix alias if appropriate */

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 77b2f4098a1e76f37cdb4af0c7110a0126c8795b..fbb532a416f2f8f96fafe2eb493ed9db13ada2f9 100644 (file)
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -92,6 +92,7 @@ do_delete(
        if( rc != LDAP_SUCCESS ) {
                send_ldap_result( conn, op, rc,
                        NULL, NULL, NULL, NULL );
+               goto cleanup;
        }
 
        if ( global_readonly || be->be_readonly ) {

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index a1cc074cec20c879ccdfc5cd1aef136da68365d6..f8392e8f03c074d80ab879849680e69540e45778 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -184,6 +184,7 @@ do_modify(
        if( rc != LDAP_SUCCESS ) {
                send_ldap_result( conn, op, rc,
                        NULL, NULL, NULL, NULL );
+               goto cleanup;
        }
 
        if ( global_readonly || be->be_readonly ) {

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index 0467e54dc6f35cd26b0098fd018324a5340fd694..784fe795c5ec19324bf1f768f152bc8265837231 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -178,6 +178,7 @@ do_modrdn(
        if( rc != LDAP_SUCCESS ) {
                send_ldap_result( conn, op, rc,
                        NULL, NULL, NULL, NULL );
+               goto cleanup;
        }
 
        if ( global_readonly || be->be_readonly ) {

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 10e6d67b27601e43d908f32e34f1b7621eaf620d..6fc3101c17b21705728e1c2a0f3aa0ddac187c93 100644 (file)
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -210,6 +210,7 @@ do_search(
        if( rc != LDAP_SUCCESS ) {
                send_ldap_result( conn, op, rc,
                        NULL, NULL, NULL, NULL );
+               goto return_results;
        }
 
        /* deref the base if needed */