improve error handling

diff --git a/servers/slapd/back-meta/add.c b/servers/slapd/back-meta/add.c
index 61ce46deedd859847023f76e099af72056e933fd..64e1efafda8d188f6f5634c965e56e174a888f1e 100644 (file)
--- a/servers/slapd/back-meta/add.c
+++ b/servers/slapd/back-meta/add.c
@@ -102,7 +102,8 @@ meta_back_add(
         */
        lc = meta_back_getconn( li, conn, op, META_OP_REQUIRE_SINGLE,
                        &e->e_nname, &candidate );
-       if ( !lc || !meta_back_dobind( lc, op ) || !meta_back_is_valid( lc, candidate ) ) {
+       if ( !lc || !meta_back_dobind( lc, op )
+                       || !meta_back_is_valid( lc, candidate ) ) {
                send_ldap_result( conn, op, LDAP_OTHER,
                                NULL, NULL, NULL, NULL );
                return -1;

diff --git a/servers/slapd/back-meta/compare.c b/servers/slapd/back-meta/compare.c
index 815e515cadd6633271948233b9429a8cf340ef15..b4131c7557c667916df4003b218e67d0362cd18e 100644 (file)
--- a/servers/slapd/back-meta/compare.c
+++ b/servers/slapd/back-meta/compare.c
@@ -96,6 +96,8 @@ meta_back_compare(
        lc = meta_back_getconn( li, conn, op, META_OP_ALLOW_MULTIPLE,
                        ndn, NULL );
        if ( !lc || !meta_back_dobind( lc, op ) ) {
+               send_ldap_result( conn, op, LDAP_OTHER,
+                               NULL, NULL, NULL, NULL );
                return -1;
        }
 

diff --git a/servers/slapd/back-meta/delete.c b/servers/slapd/back-meta/delete.c
index 127bbfd4f4d9840fa847f6cb2540c5c80126c77d..22a9e569ed0379ba1a9630bde31d49be7001ba74 100644 (file)
--- a/servers/slapd/back-meta/delete.c
+++ b/servers/slapd/back-meta/delete.c
@@ -92,9 +92,10 @@ meta_back_delete(
 
        lc = meta_back_getconn( li, conn, op, META_OP_REQUIRE_SINGLE,
                        ndn, &candidate );
-       if ( !lc || !meta_back_dobind( lc, op ) || !meta_back_is_valid( lc, candidate ) ) {
-               send_ldap_result( conn, op, LDAP_OTHER,
-                               NULL, NULL, NULL, NULL );
+       if ( !lc || !meta_back_dobind( lc, op )
+                       || !meta_back_is_valid( lc, candidate ) ) {
+               send_ldap_result( conn, op, LDAP_OTHER,
+                               NULL, NULL, NULL, NULL );
                return -1;
        }
 

diff --git a/servers/slapd/back-meta/modify.c b/servers/slapd/back-meta/modify.c
index 01fec49787949fe77839ed497f18c52dcd08cc12..0480d4936b02d995d546c645cd752864938699fd 100644 (file)
--- a/servers/slapd/back-meta/modify.c
+++ b/servers/slapd/back-meta/modify.c
@@ -96,9 +96,10 @@ meta_back_modify(
 
        lc = meta_back_getconn( li, conn, op, META_OP_REQUIRE_SINGLE,
                        ndn, &candidate );
-       if ( !lc || !meta_back_dobind( lc, op ) || !meta_back_is_valid( lc, candidate ) ) {
-               send_ldap_result( conn, op, LDAP_OTHER,
-                               NULL, NULL, NULL, NULL );
+       if ( !lc || !meta_back_dobind( lc, op )
+                       || !meta_back_is_valid( lc, candidate ) ) {
+               send_ldap_result( conn, op, LDAP_OTHER,
+                               NULL, NULL, NULL, NULL );
                return -1;
        }
 

diff --git a/servers/slapd/back-meta/modrdn.c b/servers/slapd/back-meta/modrdn.c
index 1169052a96319c810d485c9843b712d52962e893..34cfebfe9691543a0be72b625a6ceaea240ae41f 100644 (file)
--- a/servers/slapd/back-meta/modrdn.c
+++ b/servers/slapd/back-meta/modrdn.c
@@ -97,9 +97,10 @@ meta_back_modrdn(
 
        lc = meta_back_getconn( li, conn, op, META_OP_REQUIRE_SINGLE,
                        ndn, &candidate );
-       if ( !lc || !meta_back_dobind( lc, op ) || !meta_back_is_valid( lc, candidate ) ) {
-               send_ldap_result( conn, op, LDAP_OTHER,
-                               NULL, NULL, NULL, NULL );
+       if ( !lc || !meta_back_dobind( lc, op ) 
+                       || !meta_back_is_valid( lc, candidate ) ) {
+               send_ldap_result( conn, op, LDAP_OTHER,
+                               NULL, NULL, NULL, NULL );
                return -1;
        }
 

diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index a11cc1d44a41bd0b5ceb5dd2d5e013965df1d50d..39e2114ae5c4aa9353c68d6aeb5ebdbfd97ca7a8 100644 (file)
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -138,6 +138,8 @@ meta_back_search(
        lc = meta_back_getconn( li, conn, op, META_OP_ALLOW_MULTIPLE, 
                        nbase, NULL );
        if ( !lc || !meta_back_dobind( lc, op ) ) {
+               send_ldap_result( conn, op, LDAP_OTHER,
+                               NULL, NULL, NULL, NULL );
                return -1;
        }