Return LDAP_OTHER instead of LDAP_OPERATIONS_ERROR for internal SLAPI

failure

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 9c55df9f79b0b4f6e4bbdc696b1afa1e48fecc5a..0c5ea86c52f4c7d65ee3bbe2fc8508772c0cce04 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -246,7 +246,7 @@ do_add( Connection *conn, Operation *op )
                Debug(LDAP_DEBUG_TRACE, "do_add: add preoperation plugin failed.\n",
                                0, 0, 0);
                if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0 )
-                       rc = LDAP_OPERATIONS_ERROR;
+                       rc = LDAP_OTHER;
                goto done;
 #endif
        }

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index d7b1cf36ec52eb90781b3bfcdbee17c0294106eb..826954a84a561e8582718ca08be2faa1621d5b54 100644 (file)
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -559,7 +559,7 @@ do_bind(
                int ldapRc;
 
                if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&ldapRc ) != 0 )
-                       ldapRc = LDAP_OPERATIONS_ERROR;
+                       ldapRc = LDAP_OTHER;
 
                edn.bv_val = NULL;
                edn.bv_len = 0;

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index c9b328060f58e81e4d79de3c4a56535905f67a40..34b4e50cce83ab76842a81691e82e4a9bc14660f 100644 (file)
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -294,7 +294,7 @@ do_compare(
                                "failed.\n", 0, 0, 0);
 #endif
                if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0)
-                       rc = LDAP_OPERATIONS_ERROR;
+                       rc = LDAP_OTHER;
                goto cleanup;
        }
 #endif /* defined( LDAP_SLAPI ) */

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index a431c080ddeb022fb9c927f2ff43f39907a8c934..8c72b8c073407aba346d6fa1460adf08dda33189 100644 (file)
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -178,7 +178,7 @@ do_delete(
                                0, 0, 0);
 #endif
                if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0 )
-                       rc = LDAP_OPERATIONS_ERROR;
+                       rc = LDAP_OTHER;
                goto cleanup;
        }
 #endif /* defined( LDAP_SLAPI ) */

diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c
index c5ca7dca8267d29c14a08e144ab64cd15ef4c4c6..b658f215de7c8232b8d0d09848394ecdb1e40920 100644 (file)
--- a/servers/slapd/extended.c
+++ b/servers/slapd/extended.c
@@ -256,26 +256,26 @@ do_extended(
                rc = slapi_pblock_set( pb, SLAPI_EXT_OP_REQ_OID,
                                (void *)reqoid.bv_val);
                if ( rc != LDAP_SUCCESS ) {
-                       rc = LDAP_OPERATIONS_ERROR;
+                       rc = LDAP_OTHER;
                        goto done;
                }
 
                rc = slapi_pblock_set( pb, SLAPI_EXT_OP_REQ_VALUE,
                                (void *)&reqdata);
                if ( rc != LDAP_SUCCESS ) {
-                       rc = LDAP_OPERATIONS_ERROR;
+                       rc = LDAP_OTHER;
                        goto done;
                }
 
                rc = slapi_x_connection_set_pb( pb, conn );
                if ( rc != LDAP_SUCCESS ) {
-                       rc = LDAP_OPERATIONS_ERROR;
+                       rc = LDAP_OTHER;
                        goto done;
                }
 
                rc = slapi_x_operation_set_pb( pb, op );
                if ( rc != LDAP_SUCCESS ) {
-                       rc = LDAP_OPERATIONS_ERROR;
+                       rc = LDAP_OTHER;
                        goto done;
                }
 

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index f6dbac13fe11fe0fcc92ab65c15425ae9d094850..03c4c05537525b52561609dd6315a1181f603716 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -362,7 +362,7 @@ do_modify(
                                0, 0, 0);
 #endif
                if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0) {
-                       rc = LDAP_OPERATIONS_ERROR;
+                       rc = LDAP_OTHER;
                }
                ldap_mods_free( modv, 1 );
                modv = NULL;

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index ffa7410a3650cdd2ec8f29686d792088cd172f32..5bb70711828ec0c68ef933606ebaf62be7828c61 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -353,7 +353,7 @@ do_modrdn(
                                "failed.\n", 0, 0, 0);
 #endif
                if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0)
-                       rc = LDAP_OPERATIONS_ERROR;
+                       rc = LDAP_OTHER;
                goto cleanup;
        }
 #endif /* defined( LDAP_SLAPI ) */

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index d72b6397e6c6b2470a19e0a959b996b7b8b00dbb..c4c5fb01aaf9a54363e06c46a9c65c8e61b3554a 100644 (file)
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -367,7 +367,7 @@ do_search(
                                "failed.\n", 0, 0, 0);
 #endif
                if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0)
-                       rc = LDAP_OPERATIONS_ERROR;
+                       rc = LDAP_OTHER;
                return rc;
        }
 #endif /* defined( LDAP_SLAPI ) */