s/LDAP_OPERATIONS_ERROR/LDAP_OTHER/

diff --git a/servers/slapd/back-bdb/extended.c b/servers/slapd/back-bdb/extended.c
new file mode 100644 (file)
index 0000000..e3c26e1
--- /dev/null
+++ b/servers/slapd/back-bdb/extended.c
@@ -0,0 +1,53 @@
+/* extended.c - bdb backend extended routines */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+
+#include "portable.h"
+
+#include <stdio.h>
+#include <ac/string.h>
+
+#include "back-bdb.h"
+#include "external.h"
+
+static struct exop {
+       char *oid;
+       BI_op_extended  *extended;
+} exop_table[] = {
+       { LDAP_EXOP_MODIFY_PASSWD, bdb_exop_passwd },
+       { NULL, NULL }
+};
+
+int
+bdb_extended(
+       Backend         *be,
+       Connection              *conn,
+       Operation               *op,
+       const char              *reqoid,
+       struct berval   *reqdata,
+       char            **rspoid,
+       struct berval   **rspdata,
+       LDAPControl *** rspctrls,
+       const char**    text,
+       BerVarray       *refs 
+)
+{
+       int i;
+
+       for( i=0; exop_table[i].oid != NULL; i++ ) {
+               if( strcmp( exop_table[i].oid, reqoid ) == 0 ) {
+                       return (exop_table[i].extended)(
+                               be, conn, op,
+                               reqoid, reqdata,
+                               rspoid, rspdata, rspctrls,
+                               text, refs );
+               }
+       }
+
+       *text = "not supported within naming context";
+       return LDAP_UNWILLING_TO_PERFORM;
+}
+

diff --git a/servers/slapd/back-bdb/modrdn.c b/servers/slapd/back-bdb/modrdn.c
index da4ab3ec95b9e11bda48e4c8a4166554c5d6b649..dde788b392728da9114fa2c98788269849fd3e7a 100644 (file)
--- a/servers/slapd/back-bdb/modrdn.c
+++ b/servers/slapd/back-bdb/modrdn.c
@@ -449,7 +449,7 @@ retry:      /* transaction retry */
                                        0, 0, 0 );
 #endif
 
-                               rc = LDAP_OPERATIONS_ERROR;
+                               rc = LDAP_OTHER;
                                goto return_results;
                        }
 
@@ -588,7 +588,7 @@ retry:      /* transaction retry */
                        "bdb_modrdn: can't figure out type(s)/values(s) "
                        "of newrdn\n", 0, 0, 0 );
 #endif
-               rc = LDAP_OPERATIONS_ERROR;
+               rc = LDAP_INVALID_DN_SYNTAX;
                text = "unknown type(s) used in RDN";
                goto return_results;            
        }

diff --git a/servers/slapd/back-bdb/passwd.c b/servers/slapd/back-bdb/passwd.c
index 17d54cacc5a733022e1a2d18e0d5cc17a4040e53..4988e2512238ec18fc82af4e06a25b1fde51f57d 100644 (file)
--- a/servers/slapd/back-bdb/passwd.c
+++ b/servers/slapd/back-bdb/passwd.c
@@ -98,7 +98,7 @@ bdb_exop_passwd(
 
        if( dn.bv_len == 0 ) {
                *text = "No password is associated with the Root DSE";
-               rc = LDAP_OPERATIONS_ERROR;
+               rc = LDAP_UNWILLING_TO_PERFORM;
                goto done;
        }
 

diff --git a/servers/slapd/back-ldap/add.c b/servers/slapd/back-ldap/add.c
index b947441efb5721e68411cbe377d4eb3fa66ddd61..c12a313e8bd78d5ccbbdc07808f9cdb665c4885b 100644 (file)
--- a/servers/slapd/back-ldap/add.c
+++ b/servers/slapd/back-ldap/add.c
@@ -99,7 +99,7 @@ ldap_back_add(
                return( -1 );
                
        case REWRITE_REGEXEC_ERR:
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+               send_ldap_result( conn, op, LDAP_OTHER,
                                NULL, "Operations error", NULL, NULL );
                return( -1 );
        }

diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index 32d432c285c7c39496210860701bfde1c6b64d3b..92d5856fa1ff00c248a15e707f036e3d4ad69d10 100644 (file)
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -98,7 +98,7 @@ ldap_back_bind(
                return( -1 );
 
        case REWRITE_REGEXEC_ERR:
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+               send_ldap_result( conn, op, LDAP_OTHER,
                                NULL, "Operations error", NULL, NULL );
                return( -1 );
        }
@@ -281,7 +281,7 @@ ldap_back_getconn(struct ldapinfo *li, Connection *conn, Operation *op)
                                
                        case REWRITE_REGEXEC_ERR:
                                send_ldap_result( conn, op,
-                                               LDAP_OPERATIONS_ERROR,
+                                               LDAP_OTHER,
                                                NULL, "Operations error",
                                                NULL, NULL );
                                return( NULL );
@@ -322,7 +322,7 @@ ldap_back_getconn(struct ldapinfo *li, Connection *conn, Operation *op)
                
                /* Err could be -1 in case a duplicate ldapconn is inserted */
                if ( err != 0 ) {
-                       send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                       send_ldap_result( conn, op, LDAP_OTHER,
                        NULL, "internal server error", NULL, NULL );
                        /* better destroy the ldapconn struct? */
                        return( NULL );
@@ -389,7 +389,7 @@ ldap_back_map_result(int err)
        case LDAP_SERVER_DOWN:
                return LDAP_UNAVAILABLE;
        case LDAP_LOCAL_ERROR:
-               return LDAP_OPERATIONS_ERROR;
+               return LDAP_OTHER;
        case LDAP_ENCODING_ERROR:
        case LDAP_DECODING_ERROR:
                return LDAP_PROTOCOL_ERROR;
@@ -398,13 +398,13 @@ ldap_back_map_result(int err)
        case LDAP_AUTH_UNKNOWN:
                return LDAP_AUTH_METHOD_NOT_SUPPORTED;
        case LDAP_FILTER_ERROR:
-               return LDAP_OPERATIONS_ERROR;
+               return LDAP_OTHER;
        case LDAP_USER_CANCELLED:
-               return LDAP_OPERATIONS_ERROR;
+               return LDAP_OTHER;
        case LDAP_PARAM_ERROR:
                return LDAP_PROTOCOL_ERROR;
        case LDAP_NO_MEMORY:
-               return LDAP_OPERATIONS_ERROR;
+               return LDAP_OTHER;
        case LDAP_CONNECT_ERROR:
                return LDAP_UNAVAILABLE;
        case LDAP_NOT_SUPPORTED:

diff --git a/servers/slapd/back-ldap/compare.c b/servers/slapd/back-ldap/compare.c
index d7d1f77f9de07d4cd44fcea86eab010de127061b..2b677edb5a5bf1da5c98d5e7d29807693a74d5c6 100644 (file)
--- a/servers/slapd/back-ldap/compare.c
+++ b/servers/slapd/back-ldap/compare.c
@@ -89,7 +89,7 @@ ldap_back_compare(
                return( -1 );
                
        case REWRITE_REGEXEC_ERR:
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+               send_ldap_result( conn, op, LDAP_OTHER,
                                NULL, "Operations error", NULL, NULL );
                return( -1 );
        }

diff --git a/servers/slapd/back-ldap/delete.c b/servers/slapd/back-ldap/delete.c
index 115252ba313134607722366733c7663653701bd1..d545f77b14701c032cc8e4015cb0bc2b937f328b 100644 (file)
--- a/servers/slapd/back-ldap/delete.c
+++ b/servers/slapd/back-ldap/delete.c
@@ -89,7 +89,7 @@ ldap_back_delete(
                return( -1 );
 
        case REWRITE_REGEXEC_ERR:
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+               send_ldap_result( conn, op, LDAP_OTHER,
                                NULL, "Operations error", NULL, NULL );
                return( -1 );
        }

diff --git a/servers/slapd/back-ldap/modify.c b/servers/slapd/back-ldap/modify.c
index 8e19960fe76f5191ca50d01adc8aa179b1edf67e..0bbb52e867201712336622da03e14e83028d760d 100644 (file)
--- a/servers/slapd/back-ldap/modify.c
+++ b/servers/slapd/back-ldap/modify.c
@@ -93,7 +93,7 @@ ldap_back_modify(
                return( -1 );
 
        case REWRITE_REGEXEC_ERR:
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+               send_ldap_result( conn, op, LDAP_OTHER,
                                NULL, "Operations error", NULL, NULL );
                return( -1 );
        }

diff --git a/servers/slapd/back-ldap/modrdn.c b/servers/slapd/back-ldap/modrdn.c
index 5caf780e8cfe9aadfefce41347b9a35e890bfb84..8c7eee586999da39d18882f3c568f6dcee9f1738 100644 (file)
--- a/servers/slapd/back-ldap/modrdn.c
+++ b/servers/slapd/back-ldap/modrdn.c
@@ -101,7 +101,7 @@ ldap_back_modrdn(
                        return( -1 );
 
                case REWRITE_REGEXEC_ERR:
-                       send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                       send_ldap_result( conn, op, LDAP_OTHER,
                                        NULL, "Operations error",
                                        NULL, NULL );
                        return( -1 );
@@ -138,7 +138,7 @@ ldap_back_modrdn(
                return( -1 );
 
        case REWRITE_REGEXEC_ERR:
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+               send_ldap_result( conn, op, LDAP_OTHER,
                                NULL, "Operations error", NULL, NULL );
                return( -1 );
        }

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index 65d9b8110704f907ec4ba4839085682ffebdd2e4..146abc336bd360be1d38de6c77609d16f897ea8f 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -169,7 +169,7 @@ ldap_back_search(
                goto finish;
 
        case REWRITE_REGEXEC_ERR:
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+               send_ldap_result( conn, op, LDAP_OTHER,
                                NULL, "Operations error", NULL, NULL );
                rc = -1;
                goto finish;

diff --git a/servers/slapd/back-ldbm/add.c b/servers/slapd/back-ldbm/add.c
index 64854753fa332688e76e1f087fa0721501d02c4d..65d1d11370d0c9e29b65da6c32f97e17fd5fbb3e 100644 (file)
--- a/servers/slapd/back-ldbm/add.c
+++ b/servers/slapd/back-ldbm/add.c
@@ -47,7 +47,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/extended.c b/servers/slapd/back-ldbm/extended.c
new file mode 100644 (file)
index 0000000..93da721
--- /dev/null
+++ b/servers/slapd/back-ldbm/extended.c
@@ -0,0 +1,56 @@
+/* extended.c - ldbm backend extended routines */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+
+#include "portable.h"
+
+#include <stdio.h>
+
+#include <ac/socket.h>
+#include <ac/string.h>
+
+#include "slap.h"
+#include "back-ldbm.h"
+#include "proto-back-ldbm.h"
+
+struct exop {
+       char *oid;
+       BI_op_extended  *extended;
+} exop_table[] = {
+       { LDAP_EXOP_MODIFY_PASSWD, ldbm_back_exop_passwd },
+       { NULL, NULL }
+};
+
+int
+ldbm_back_extended(
+    Backend            *be,
+    Connection         *conn,
+    Operation          *op,
+       const char              *reqoid,
+    struct berval      *reqdata,
+       char            **rspoid,
+    struct berval      **rspdata,
+       LDAPControl *** rspctrls,
+       const char**    text,
+    BerVarray *refs 
+)
+{
+       int i;
+
+       for( i=0; exop_table[i].oid != NULL; i++ ) {
+               if( strcmp( exop_table[i].oid, reqoid ) == 0 ) {
+                       return (exop_table[i].extended)(
+                               be, conn, op,
+                               reqoid, reqdata,
+                               rspoid, rspdata, rspctrls,
+                               text, refs );
+               }
+       }
+
+       *text = "not supported within naming context";
+       return LDAP_UNWILLING_TO_PERFORM;
+}
+

diff --git a/servers/slapd/back-ldbm/modrdn.c b/servers/slapd/back-ldbm/modrdn.c
index eb01cee71dfb28018ac3d06b4858fac0b735f0de..540796215b10954bbd0d104cd0f3b948cef976f3 100644 (file)
--- a/servers/slapd/back-ldbm/modrdn.c
+++ b/servers/slapd/back-ldbm/modrdn.c
@@ -384,7 +384,7 @@ ldbm_back_modrdn(
                                        np->e_dn, 0, 0 );
 #endif
 
-                               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;
@@ -475,7 +475,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;
        }
@@ -506,7 +506,7 @@ ldbm_back_modrdn(
                    0, 0, 0 );
 #endif
 
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+               send_ldap_result( conn, op, LDAP_INVALID_DN_SYNTAX,
                        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 e7df1ae28fa5e3249901e93dace665fa0ff3eb1f..315277e78496488982eebc89c79008858706ee99 100644 (file)
--- a/servers/slapd/back-ldbm/passwd.c
+++ b/servers/slapd/back-ldbm/passwd.c
@@ -97,7 +97,7 @@ ldbm_back_exop_passwd(
 
        if( dn.bv_len == 0 ) {
                *text = "No password is associated with the Root DSE";
-               rc = LDAP_OPERATIONS_ERROR;
+               rc = LDAP_UNWILLING_TO_PERFORM;
                goto done;
        }
 
@@ -125,7 +125,7 @@ ldbm_back_exop_passwd(
                goto done;
        }
 
-       rc = LDAP_OPERATIONS_ERROR;
+       rc = LDAP_OTHER;
 
        if( is_entry_referral( e ) ) {
                /* entry is an referral, don't allow operation */

diff --git a/servers/slapd/back-meta/add.c b/servers/slapd/back-meta/add.c
index ce3d73fecdb4175218be7f7343a1fc638c5ee778..1c87903f451e843188468596038fb64bb74dd47e 100644 (file)
--- a/servers/slapd/back-meta/add.c
+++ b/servers/slapd/back-meta/add.c
@@ -103,7 +103,7 @@ 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 ) ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+               send_ldap_result( conn, op, LDAP_OTHER,
                                NULL, NULL, NULL, NULL );
                return -1;
        }
@@ -135,7 +135,7 @@ meta_back_add(
                return -1;
                
        case REWRITE_REGEXEC_ERR:
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+               send_ldap_result( conn, op, LDAP_OTHER,
                                NULL, NULL, NULL, NULL );
                return -1;
        }

diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c
index 9dc738a87327d977d4bee30a420a2dd9b20d4df0..1eb07531c3ee0f27d9d7ed9b0a46e1adf0330e70 100644 (file)
--- a/servers/slapd/back-meta/bind.c
+++ b/servers/slapd/back-meta/bind.c
@@ -124,7 +124,7 @@ meta_back_bind(
                                "meta_back_bind: no target for dn %s.\n%s%s",
                                dn->bv_val, "", "");
 #endif /* !NEW_LOGGING */
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, 
+               send_ldap_result( conn, op, LDAP_OTHER, 
                                NULL, NULL, NULL, NULL );
                return -1;
        }
@@ -260,7 +260,7 @@ meta_back_do_single_bind(
                return LDAP_UNWILLING_TO_PERFORM;
 
        case REWRITE_REGEXEC_ERR:
-               return LDAP_OPERATIONS_ERROR;
+               return LDAP_OTHER;
        }
 
        rc = ldap_bind_s( lc->conns[ candidate ]->ld, mdn.bv_val, cred->bv_val, method );

diff --git a/servers/slapd/back-meta/compare.c b/servers/slapd/back-meta/compare.c
index 40cc65159ace4f554e7a14785b47ae1ec535423a..fea4dcf9d28b76d03b20d4f64ee0902ad9163f4e 100644 (file)
--- a/servers/slapd/back-meta/compare.c
+++ b/servers/slapd/back-meta/compare.c
@@ -143,8 +143,8 @@ meta_back_compare(
                        return -1;
                        
                case REWRITE_REGEXEC_ERR:
-                       send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-                                       NULL, "Operations error",
+                       send_ldap_result( conn, op,  LDAP_OTHER,
+                                       NULL, "Rewrite error",
                                        NULL, NULL );
                        return -1;
                }
@@ -227,7 +227,7 @@ meta_back_compare(
                                continue;
                        } else if ( lrc == LDAP_RES_COMPARE ) {
                                if ( count > 0 ) {
-                                       rres = LDAP_OPERATIONS_ERROR;
+                                       rres = LDAP_OTHER;
                                        rc = -1;
                                        goto finish;
                                }
@@ -331,8 +331,8 @@ finish:;
                        goto cleanup;
                        
                case REWRITE_REGEXEC_ERR:
-                       send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-                                       NULL, "Operations error",
+                       send_ldap_result( conn, op, LDAP_OTHER,
+                                       NULL, "Rewrite error",
                                        NULL, NULL );
                        rc = -1;
                        goto cleanup;

diff --git a/servers/slapd/back-meta/conn.c b/servers/slapd/back-meta/conn.c
index 739af0e44b5ab6c1ebf767d319027dfdac17327d..7eeba8597236b5c98c9a33f81455cc19f71306b4 100644 (file)
--- a/servers/slapd/back-meta/conn.c
+++ b/servers/slapd/back-meta/conn.c
@@ -308,10 +308,10 @@ init_one_conn(
                        
                case REWRITE_REGEXEC_ERR:
                        send_ldap_result( conn, op,
-                                       LDAP_OPERATIONS_ERROR,
-                                       NULL, "Operations error",
+                                       LDAP_OTHER,
+                                       NULL, "Rewrite error",
                                        NULL, NULL );
-                       return LDAP_OPERATIONS_ERROR;
+                       return LDAP_OTHER;
                }
 
                assert( lsc->bound_dn.bv_val );
@@ -524,7 +524,7 @@ meta_back_getconn(
                 * Err could be -1 in case a duplicate metaconn is inserted
                 */
                if ( err != 0 ) {
-                       send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                       send_ldap_result( conn, op, LDAP_OTHER,
                        NULL, "Internal server error", NULL, NULL );
                        metaconn_free( lc );
                        return NULL;

diff --git a/servers/slapd/back-meta/delete.c b/servers/slapd/back-meta/delete.c
index 21613c591df294cce871d3b1d0e83c36f0ec2673..ce268732ed69a4fb529bca67a2a8476f5ea34e8d 100644 (file)
--- a/servers/slapd/back-meta/delete.c
+++ b/servers/slapd/back-meta/delete.c
@@ -93,7 +93,7 @@ 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_OPERATIONS_ERROR,
+               send_ldap_result( conn, op, LDAP_OTHER,
                                NULL, NULL, NULL, NULL );
                return -1;
        }
@@ -122,7 +122,7 @@ meta_back_delete(
                return -1;
 
        case REWRITE_REGEXEC_ERR:
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+               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 9a2813e38c8d58afb8ce6ad5dbf8966896c4aace..24013e8a8f5682dd8b3f0e5dfb6a78aa4a7ddd36 100644 (file)
--- a/servers/slapd/back-meta/modify.c
+++ b/servers/slapd/back-meta/modify.c
@@ -97,7 +97,7 @@ 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_OPERATIONS_ERROR,
+               send_ldap_result( conn, op, LDAP_OTHER,
                                NULL, NULL, NULL, NULL );
                return -1;
        }
@@ -126,7 +126,7 @@ meta_back_modify(
                return -1;
 
        case REWRITE_REGEXEC_ERR:
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+               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 1ce1c53146c9849c8b48dcb5cf297a66b80b269e..0f05e4f713a084f1bef9dab461f8c8c61f2c713e 100644 (file)
--- a/servers/slapd/back-meta/modrdn.c
+++ b/servers/slapd/back-meta/modrdn.c
@@ -98,7 +98,7 @@ 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_OPERATIONS_ERROR,
+               send_ldap_result( conn, op, LDAP_OTHER,
                                NULL, NULL, NULL, NULL );
                return -1;
        }
@@ -159,7 +159,7 @@ meta_back_modrdn(
                        return -1;
 
                case REWRITE_REGEXEC_ERR:
-                       send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                       send_ldap_result( conn, op, LDAP_OTHER,
                                        NULL, NULL, NULL, NULL );
                        return -1;
                }
@@ -189,7 +189,7 @@ meta_back_modrdn(
                return -1;
 
        case REWRITE_REGEXEC_ERR:
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+               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 f1b2f698cb4b7c0c94a653cd7dfe8406f095c99f..811a51ee42789947de09d03f0144dea7c3135cd1 100644 (file)
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -144,7 +144,7 @@ meta_back_search(
         */
        msgid = ch_calloc( sizeof( int ), li->ntargets );
        if ( msgid == NULL ) {
-               send_search_result( conn, op, LDAP_OPERATIONS_ERROR,
+               send_search_result( conn, op, LDAP_OTHER,
                                NULL, NULL, NULL, NULL, 0 );
                return -1;
        }
@@ -294,8 +294,8 @@ meta_back_search(
                        goto finish;
 
                case REWRITE_REGEXEC_ERR:
-                       send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-                                       NULL, "Operations error",
+                       send_ldap_result( conn, op, LDAP_OTHER,
+                                       NULL, "Rewrite error",
                                        NULL, NULL );
                        rc = -1;
                        goto finish;
@@ -334,7 +334,7 @@ meta_back_search(
                        goto finish;
 
                case REWRITE_REGEXEC_ERR:
-                       send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                       send_ldap_result( conn, op, LDAP_OTHER,
                                        NULL, NULL, NULL, NULL );
                        rc = -1;
                        goto finish;
@@ -438,7 +438,7 @@ meta_back_search(
                                ( void )meta_clear_unused_candidates( li,
                                                lc, -1, 0 );
                                send_search_result( conn, op,
-                                               LDAP_OPERATIONS_ERROR,
+                                               LDAP_OTHER,
                                                "", "", NULL, NULL, count );
                                
                                /* anything else needs be done? */
@@ -538,7 +538,7 @@ meta_back_search(
                        goto finish;
                        
                case REWRITE_REGEXEC_ERR:
-                       send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                       send_ldap_result( conn, op, LDAP_OTHER,
                                        NULL, NULL, NULL, NULL );
                        rc = -1;
                        goto finish;

diff --git a/servers/slapd/back-monitor/log.c b/servers/slapd/back-monitor/log.c
index 1c12104b2f80c0dcffafbbe61af6f0543128f46c..669f250706494c56b5847d7c3fc25aa2a21621c1 100644 (file)
--- a/servers/slapd/back-monitor/log.c
+++ b/servers/slapd/back-monitor/log.c
@@ -180,7 +180,7 @@ monitor_subsys_log_modify(
                        break;
 
                default:
-                       rc = LDAP_OPERATIONS_ERROR;
+                       rc = LDAP_OTHER;
                        break;
                }
 

diff --git a/servers/slapd/back-passwd/search.c b/servers/slapd/back-passwd/search.c
index 34e077bb66fe7da68f3d816cdcdd8ff862884104..f3cef18881aed68224f1782b646cdd9af20122fb 100644 (file)
--- a/servers/slapd/back-passwd/search.c
+++ b/servers/slapd/back-passwd/search.c
@@ -144,7 +144,7 @@ passwd_back_search(
                                }
 
                                if ( !(e = pw2entry( be, pw, &text )) ) {
-                                       err = LDAP_OPERATIONS_ERROR;
+                                       err = LDAP_OTHER;
                                        endpwent();
                                        ldap_pvt_thread_mutex_unlock( &passwd_mutex );
                                        goto done;
@@ -198,7 +198,7 @@ passwd_back_search(
                if ( ldap_bv2rdn( base, &rdn, (char **)&text,
                        LDAP_DN_FORMAT_LDAP ))
                { 
-                       err = LDAP_OPERATIONS_ERROR;
+                       err = LDAP_OTHER;
                        goto done;
                }
 
@@ -214,7 +214,7 @@ passwd_back_search(
                e = pw2entry( be, pw, &text );
                ldap_pvt_thread_mutex_unlock( &passwd_mutex );
                if ( !e ) {
-                       err = LDAP_OPERATIONS_ERROR;
+                       err = LDAP_OTHER;
                        goto done;
                }
 

diff --git a/servers/slapd/back-shell/add.c b/servers/slapd/back-shell/add.c
index 1d08c0c0887def0ccf79e7c07e10fd1396e39c3e..2eb06b53ad601652b3f199624917194f46d897ca 100644 (file)
--- a/servers/slapd/back-shell/add.c
+++ b/servers/slapd/back-shell/add.c
@@ -34,7 +34,7 @@ shell_back_add(
        }
 
        if ( (op->o_private = (void *) forkandexec( si->si_add, &rfp, &wfp )) == (void *) -1 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
+               send_ldap_result( conn, op, LDAP_OTHER, NULL,
                    "could not fork/exec", NULL, NULL );
                return( -1 );
        }

diff --git a/servers/slapd/back-shell/bind.c b/servers/slapd/back-shell/bind.c
index e41c06c1f2f46214810be2ff28391054595f1368..6c4ec9ab48f0d20e37c1864164cdf686b56ab671 100644 (file)
--- a/servers/slapd/back-shell/bind.c
+++ b/servers/slapd/back-shell/bind.c
@@ -39,7 +39,7 @@ shell_back_bind(
 
        if ( (op->o_private = (void *) forkandexec( si->si_bind, &rfp, &wfp ))
            == (void *) -1 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
+               send_ldap_result( conn, op, LDAP_OTHER, NULL,
                    "could not fork/exec", NULL, NULL );
                return( -1 );
        }

diff --git a/servers/slapd/back-shell/compare.c b/servers/slapd/back-shell/compare.c
index 4b19e8f37488df695178bf7d78306d867abafd4b..19a3498c96e4cfaf08a6ec5b48018f56eb19073c 100644 (file)
--- a/servers/slapd/back-shell/compare.c
+++ b/servers/slapd/back-shell/compare.c
@@ -36,7 +36,7 @@ shell_back_compare(
 
        if ( (op->o_private = (void *) forkandexec( si->si_compare, &rfp, &wfp ))
            == (void *) -1 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
+               send_ldap_result( conn, op, LDAP_OTHER, NULL,
                    "could not fork/exec", NULL, NULL );
                return( -1 );
        }

diff --git a/servers/slapd/back-shell/delete.c b/servers/slapd/back-shell/delete.c
index 6d3b27908d6437ee9996729887d0e747a2b7ba13..73dd65e52fbd9eaaab4b545b852b5d60d0e64021 100644 (file)
--- a/servers/slapd/back-shell/delete.c
+++ b/servers/slapd/back-shell/delete.c
@@ -35,7 +35,7 @@ shell_back_delete(
 
        if ( (op->o_private = (void *) forkandexec( si->si_delete, &rfp, &wfp ))
            == (void *) -1 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
+               send_ldap_result( conn, op, LDAP_OTHER, NULL,
                    "could not fork/exec", NULL, NULL );
                return( -1 );
        }

diff --git a/servers/slapd/back-shell/modify.c b/servers/slapd/back-shell/modify.c
index 0b1719eddd971602a0a176135db8bc3e28862927..69ad41d740ab6d5f9939ecd017e081d77e11e9b6 100644 (file)
--- a/servers/slapd/back-shell/modify.c
+++ b/servers/slapd/back-shell/modify.c
@@ -38,7 +38,7 @@ shell_back_modify(
 
        if ( (op->o_private = (void *) forkandexec( si->si_modify, &rfp, &wfp ))
            == (void *) -1 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
+               send_ldap_result( conn, op, LDAP_OTHER, NULL,
                    "could not fork/exec", NULL, NULL );
                return( -1 );
        }

diff --git a/servers/slapd/back-shell/modrdn.c b/servers/slapd/back-shell/modrdn.c
index 68bfed97957e5ef9f7c0c57db5c20fff13905d95..2e92d8731c90340cddd19effba9b985b5afcafed 100644 (file)
--- a/servers/slapd/back-shell/modrdn.c
+++ b/servers/slapd/back-shell/modrdn.c
@@ -53,7 +53,7 @@ shell_back_modrdn(
 
        if ( (op->o_private = (void *) forkandexec( si->si_modrdn, &rfp, &wfp ))
            == (void *) -1 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
+               send_ldap_result( conn, op, LDAP_OTHER, NULL,
                    "could not fork/exec", NULL, NULL );
                return( -1 );
        }

diff --git a/servers/slapd/back-shell/search.c b/servers/slapd/back-shell/search.c
index c8c1118172449f9ccc9bb587bdcc6410817087a8..13ca4cb02e07362c02bfd139018308edbe5f66c4 100644 (file)
--- a/servers/slapd/back-shell/search.c
+++ b/servers/slapd/back-shell/search.c
@@ -44,7 +44,7 @@ shell_back_search(
 
        if ( (op->o_private = (void *) forkandexec( si->si_search, &rfp, &wfp ))
            == (void *) -1 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
+               send_ldap_result( conn, op, LDAP_OTHER, NULL,
                    "could not fork/exec", NULL, NULL );
                return( -1 );
        }

diff --git a/servers/slapd/shell-backends/shellutil.c b/servers/slapd/shell-backends/shellutil.c
index 82eea1665b8d879664c61c833e4e9f89d088b5f1..246e93bc3e2ce6d9aadf567b0b81b39632d3cfb2 100644 (file)
--- a/servers/slapd/shell-backends/shellutil.c
+++ b/servers/slapd/shell-backends/shellutil.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  shellutil.c - common routines useful when building shell-based backends
                 for the standalone ldap server
@@ -14,12 +15,18 @@
 */
 
 
-#include <sys/types.h>
+#include "portable.h"
+
 #include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
+#include <ac/stdarg.h>
+
 #include <pwd.h>
-#include <varargs.h>
+
+#include <ac/ctype.h>
+#include <ac/string.h>
+
 #include <lber.h>
 #include <ldap.h>
 #include "shellutil.h"
@@ -82,7 +89,8 @@ write_entry( struct ldop *op, struct ldentry *entry, FILE *ofp )
 int
 test_filter( struct ldop *op, struct ldentry *entry )
 {
-    return (( random() & 0x07 ) == 0x07 );     /* XXX random for now */
+    return ((random() & 0x07 ) == 0x07) /* XXX random for now */
+               ? LDAP_COMPARE_TRUE : LDAP_COMPARE_FALSE;
 }
 
 
@@ -133,7 +141,7 @@ parse_input( FILE *ifp, FILE *ofp, struct ldop *op )
     struct inputparams *ip;
 
     if ( fgets( line, MAXLINELEN, ifp ) == NULL ) {
-       write_result( ofp, LDAP_OPERATIONS_ERROR, NULL, "Empty Input" );
+       write_result( ofp, LDAP_OTHER, NULL, "Empty Input" );
     }
     line[ strlen( line ) - 1 ] = '\0';
     if ( strncasecmp( line, STR_OP_SEARCH, sizeof( STR_OP_SEARCH ) - 1 )
@@ -166,7 +174,7 @@ parse_input( FILE *ifp, FILE *ofp, struct ldop *op )
            if (( op->ldop_srch.ldsp_scope = atoi( args )) != LDAP_SCOPE_BASE &&
                    op->ldop_srch.ldsp_scope != LDAP_SCOPE_ONELEVEL &&
                    op->ldop_srch.ldsp_scope != LDAP_SCOPE_SUBTREE ) {
-               write_result( ofp, LDAP_OPERATIONS_ERROR, NULL, "Bad scope" );
+               write_result( ofp, LDAP_OTHER, NULL, "Bad scope" );
                return( -1 );
            }
            break;
@@ -192,7 +200,7 @@ parse_input( FILE *ifp, FILE *ofp, struct ldop *op )
                while ( args != NULL ) {
                    if (( p = strchr( args, ' ' )) != NULL ) {
                        *p++ = '\0';
-                       while ( isspace( *p )) {
+                       while ( isspace( (unsigned char) *p )) {
                            ++p;
                        }
                    }
@@ -206,7 +214,7 @@ parse_input( FILE *ifp, FILE *ofp, struct ldop *op )
 
     if ( op->ldop_suffixes == NULL || op->ldop_dn == NULL ||
                op->ldop_srch.ldsp_filter == NULL ) {
-       write_result( ofp, LDAP_OPERATIONS_ERROR, NULL,
+       write_result( ofp, LDAP_OTHER, NULL,
                "Required suffix:, base:, or filter: missing" );
        return( -1 );
     }
@@ -227,7 +235,7 @@ find_input_tag( char **linep )      /* linep is set to start of args */
 
     for ( i = 0; ips[ i ].ip_type != 0; ++i ) {
        if ( strncasecmp( *linep, ips[ i ].ip_tag, p - *linep ) == 0 ) {
-           while ( isspace( *(++p) )) {
+           while ( isspace( (unsigned char) *(++p) )) {
                ;
            }
            *linep = p;
@@ -269,7 +277,7 @@ estrdup( char *s )
 
     if (( p = strdup( s )) == NULL ) {
        debug_printf( "strdup failed\n" );
-       exit( 1 );
+       exit( EXIT_FAILURE );
     }
 
     return( p );
@@ -289,7 +297,7 @@ erealloc( void *s, unsigned size )
 
     if ( p == NULL ) {
        debug_printf( "realloc( p, %d ) failed\n", size );
-       exit( 1 );
+       exit( EXIT_FAILURE );
     }
 
     return( p );
@@ -303,7 +311,7 @@ ecalloc( unsigned nelem, unsigned elsize )
 
     if (( p = calloc( nelem, elsize )) == NULL ) {
        debug_printf( "calloc( %d, %d ) failed\n", nelem, elsize );
-       exit( 1 );
+       exit( EXIT_FAILURE );
     }
 
     return( p );
@@ -314,19 +322,16 @@ ecalloc( unsigned nelem, unsigned elsize )
 
 /* VARARGS */
 void
-debug_printf( va_alist /* char *fmt, args... */ )
-    va_dcl
+debug_printf( const char *fmt, ... )
 {
-    char       *fmt;
     va_list    ap;
 
-    if ( debugflg ) {
-       va_start( ap );
-       fmt = va_arg( ap, char * );
-       fprintf( stderr, "%s: ", progname );
-       vfprintf( stderr, fmt, ap );
-       va_end( ap );
-    }
+       if ( debugflg ) {
+               va_start( ap, fmt );
+               fprintf( stderr, "%s: ", progname );
+               vfprintf( stderr, fmt, ap );
+               va_end( ap );
+       }
 }