Cleanup OPERATIONS errors

diff --git a/servers/slapd/back-ldbm/add.c b/servers/slapd/back-ldbm/add.c
index d5908de7643351e0106fdfde360070fb21bd1988..549374639f46bfe4021b6c9ff9a7ddbe612f24c7 100644 (file)
--- a/servers/slapd/back-ldbm/add.c
+++ b/servers/slapd/back-ldbm/add.c
@@ -43,7 +43,7 @@ ldbm_back_add(
                /* if (rc) something bad happened to ldbm cache */
                ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
                send_ldap_result( conn, op, 
-                       rc ? LDAP_OPERATIONS_ERROR : LDAP_ALREADY_EXISTS,
+                       rc ? LDAP_OTHER : LDAP_ALREADY_EXISTS,
                        NULL, NULL, NULL, NULL );
                return( -1 );
        }

diff --git a/servers/slapd/back-ldbm/modrdn.c b/servers/slapd/back-ldbm/modrdn.c
index eef4ab413ea8734141caa9720efa9f68dfbf9251..9df746d9b4c95c8992f6b9661793fe79a8a16098 100644 (file)
--- a/servers/slapd/back-ldbm/modrdn.c
+++ b/servers/slapd/back-ldbm/modrdn.c
@@ -283,7 +283,7 @@ ldbm_back_modrdn(
                                Debug( LDAP_DEBUG_TRACE, "entry (%s) is referral\n",
                                        np->e_dn, 0, 0 );
 
-                               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                               send_ldap_result( conn, op, LDAP_OTHER,
                                    NULL, "newSuperior is a referral", NULL, NULL );
 
                                goto return_results;
@@ -359,7 +359,7 @@ ldbm_back_modrdn(
        if ( ( rc_id = dn2id ( be, new_ndn, &id ) ) || id != NOID ) {
                /* if (rc_id) something bad happened to ldbm cache */
                send_ldap_result( conn, op, 
-                       rc_id ? LDAP_OPERATIONS_ERROR : LDAP_ALREADY_EXISTS,
+                       rc_id ? LDAP_OTHER : LDAP_ALREADY_EXISTS,
                        NULL, NULL, NULL, NULL );
                goto return_results;
        }
@@ -377,7 +377,7 @@ ldbm_back_modrdn(
                       "ldbm_back_modrdn: can't figure out type(s)/value(s) of newrdn\n",
                       0, 0, 0 );
 
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+               send_ldap_result( conn, op, LDAP_INVALID_DN,
                        NULL, "unable to parse type(s)/value(s) used in RDN", NULL, NULL );
                goto return_results;            
        }

diff --git a/servers/slapd/back-ldbm/passwd.c b/servers/slapd/back-ldbm/passwd.c
index a059ee877d027aecf92cf94266afb549775609fa..155f9c5368e9238b82ba13db6e75b95dedb313ca 100644 (file)
--- a/servers/slapd/back-ldbm/passwd.c
+++ b/servers/slapd/back-ldbm/passwd.c
@@ -80,7 +80,7 @@ ldbm_back_exop_passwd(
 
        if( dn == NULL || dn[0] == '\0' ) {
                *text = "No password is associated with the Root DSE";
-               rc = LDAP_OPERATIONS_ERROR;
+               rc = LDAP_UNWILLING_TO_PERFORM;
                goto done;
        }