Make other backends (excepting BDB2) compile.

Integration of BDB2 changes will be deferred until after
LDBM work is completed.

diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index a0352f17c4a1e0e8ffc14cb8925cd70c451c3b1c..d57364a6373080dd372a2cd0298648a25620ad94 100644 (file)
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -76,7 +76,7 @@ ldap_back_getconn(struct ldapinfo *li, Connection *conn, Operation *op)
                ld = ldap_init(li->host, li->port);
                if (!ld) {
                        send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-                               NULL, "ldap_init failed", NULL );
+                               NULL, "ldap_init failed", NULL, NULL );
                        return( NULL );
                }
                lc = (struct ldapconn *)ch_malloc(sizeof(struct ldapconn));
@@ -112,7 +112,7 @@ ldap_back_op_result(struct ldapconn *lc, Operation *op)
        ldap_get_option(lc->ld, LDAP_OPT_ERROR_NUMBER, &err);
        ldap_get_option(lc->ld, LDAP_OPT_ERROR_STRING, &msg);
        ldap_get_option(lc->ld, LDAP_OPT_MATCHED_DN, &match);
-       send_ldap_result( lc->conn, op, err, match, msg, NULL );
+       send_ldap_result( lc->conn, op, err, match, msg, NULL, NULL );
        free(match);
        free(msg);
        return( (err==LDAP_SUCCESS) ? 0 : -1 );

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index b0f0930ad43536c5f79766e535382659ef6e3638..d0a5cf688ceba664d2acc768c17e2b8842221176 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -116,7 +116,8 @@ fail:               return( ldap_back_op_result(lc, op) );
        if (rc == -1)
                goto fail;
 
-       send_search_result( conn, op, sres, match, err, NULL, i );
+       send_search_result( conn, op, sres,
+               match, err, NULL, NULL, i );
        if (match)
                free(match);
        if (err)
@@ -158,7 +159,7 @@ ldap_send_entry(
                if (!attr->a_vals)
                        attr->a_vals = &dummy;
        }
-       send_search_entry( be, lc->conn, op, &ent, attrs, attrsonly, 0 );
+       send_search_entry( be, lc->conn, op, &ent, attrs, attrsonly, NULL, 0 );
        for (;ent.e_attrs;) {
                attr=ent.e_attrs;
                ent.e_attrs = attr->a_next;

diff --git a/servers/slapd/back-passwd/search.c b/servers/slapd/back-passwd/search.c
index 752517c1ca40e7c81c7d0c92406b813186dddb44..90e8a52e783133ee7da10b6d36bb3ea87e8cda90 100644 (file)
--- a/servers/slapd/back-passwd/search.c
+++ b/servers/slapd/back-passwd/search.c
@@ -102,7 +102,8 @@ passwd_back_search(
                attr_merge( e, "objectClass", vals );
        
                if ( test_filter( be, conn, op, e, filter ) == 0 ) {
-                       send_search_entry( be, conn, op, e, attrs, attrsonly, 0 );
+                       send_search_entry( be, conn, op,
+                               e, attrs, attrsonly, NULL, 0 );
                        matched = strdup( be->be_suffix[0] );
                        sent++;
                }
@@ -123,7 +124,7 @@ passwd_back_search(
                                /* check time limit */
                                if ( slap_get_time() > stoptime ) {
                                        send_ldap_result( conn, op, LDAP_TIMELIMIT_EXCEEDED,
-                                       NULL, NULL, NULL );
+                                       NULL, NULL, NULL, NULL );
                                        endpwent();
                                        return( 0 );
                                }
@@ -134,12 +135,13 @@ passwd_back_search(
                                        /* check size limit */
                                        if ( --slimit == -1 ) {
                                                send_ldap_result( conn, op, LDAP_SIZELIMIT_EXCEEDED,
-                                               NULL, NULL, NULL );
+                                               NULL, NULL, NULL, NULL );
                                                endpwent();
                                                return( 0 );
                                        }
 
-                                       send_search_entry( be, conn, op, e, attrs, attrsonly, 0 );
+                                       send_search_entry( be, conn, op,
+                                               e, attrs, attrsonly, NULL, 0 );
                                        sent++;
                                }
 
@@ -176,7 +178,8 @@ passwd_back_search(
                e = pw2entry( be, pw, rdn );
 
                if ( test_filter( be, conn, op, e, filter ) == 0 ) {
-                       send_search_entry( be, conn, op, e, attrs, attrsonly, 0 );
+                       send_search_entry( be, conn, op,
+                               e, attrs, attrsonly, NULL, 0 );
                        sent++;
                }
 
@@ -185,10 +188,12 @@ passwd_back_search(
 
 done:
        if( sent ) {
-               send_ldap_result( conn, op, LDAP_SUCCESS, NULL, NULL, NULL );
+               send_ldap_result( conn, op, LDAP_SUCCESS,
+                       NULL, NULL, NULL, NULL );
 
        } else {
-               send_ldap_result( conn, op, err, matched, NULL, NULL);
+               send_ldap_result( conn, op, err,
+                       matched, NULL, NULL, NULL );
        }
 
        if( matched != NULL ) free( matched );

diff --git a/servers/slapd/back-perl/add.c b/servers/slapd/back-perl/add.c
index 4e9fa2d1a015095e6fc9286f94a9d6d16452a0d4..89193b499a4c9ee833fddb2dc91e7098e76f3120 100644 (file)
--- a/servers/slapd/back-perl/add.c
+++ b/servers/slapd/back-perl/add.c
@@ -61,10 +61,12 @@ perl_back_add(
        ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );        
 
        if( return_code != 0 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL, NULL, NULL );
+               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                       NULL, NULL, NULL, NULL );
 
        } else {
-               send_ldap_result( conn, op, LDAP_SUCCESS, NULL, NULL, NULL );
+               send_ldap_result( conn, op, LDAP_SUCCESS,
+                       NULL, NULL, NULL, NULL );
        }
 
        Debug( LDAP_DEBUG_ANY, "Here ADD\n", 0, 0, 0 );

diff --git a/servers/slapd/back-perl/compare.c b/servers/slapd/back-perl/compare.c
index d66d94fd2b848018b89fade33ec8b73b920e33a1..482cdd06d58e039d89603a8939b8aa899bab75da 100644 (file)
--- a/servers/slapd/back-perl/compare.c
+++ b/servers/slapd/back-perl/compare.c
@@ -40,7 +40,7 @@ perl_back_compare(
        PerlBackend *perl_back = (PerlBackend *)be->be_private;
 
        send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
-               NULL, "not yet implemented", NULL );
+               NULL, "not yet implemented", NULL, NULL );
 
 #ifdef notdef
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  

diff --git a/servers/slapd/back-perl/delete.c b/servers/slapd/back-perl/delete.c
index f32b38eb2e887d3a80ea7a95b50b095313954ddc..53acb19945995b639731f51031b38aeff3dffd0b 100644 (file)
--- a/servers/slapd/back-perl/delete.c
+++ b/servers/slapd/back-perl/delete.c
@@ -60,10 +60,12 @@ perl_back_delete(
        ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );        
 
        if( return_code != 0 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL, NULL, NULL );
+               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                       NULL, NULL, NULL, NULL );
 
        } else {
-               send_ldap_result( conn, op, LDAP_SUCCESS, NULL, NULL, NULL );
+               send_ldap_result( conn, op, LDAP_SUCCESS,
+                       NULL, NULL, NULL, NULL );
        }
 
        Debug( LDAP_DEBUG_ANY, "Here DELETE\n", 0, 0, 0 );

diff --git a/servers/slapd/back-perl/modify.c b/servers/slapd/back-perl/modify.c
index 19a83c412be0ff81af8ffe90087206795b6bef75..025823e08114833e7199f035f3b820abbc5029b1 100644 (file)
--- a/servers/slapd/back-perl/modify.c
+++ b/servers/slapd/back-perl/modify.c
@@ -93,10 +93,12 @@ perl_back_modify(
        ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );
 
        if( return_code != 0 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL, NULL, NULL );
+               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                       NULL, NULL, NULL, NULL );
 
        } else {
-               send_ldap_result( conn, op, LDAP_SUCCESS, NULL, NULL, NULL );
+               send_ldap_result( conn, op, LDAP_SUCCESS,
+                       NULL, NULL, NULL, NULL );
        }
 
        Debug( LDAP_DEBUG_ANY, "Perl MODIFY\n", 0, 0, 0 );

diff --git a/servers/slapd/back-perl/modrdn.c b/servers/slapd/back-perl/modrdn.c
index 125bd7157ef8e46ffdf9df73643706b8265b036e..5fa8bca1231fd552ad7ec091a74e58685a138537 100644 (file)
--- a/servers/slapd/back-perl/modrdn.c
+++ b/servers/slapd/back-perl/modrdn.c
@@ -81,10 +81,12 @@ perl_back_modrdn(
        ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );
        
        if( return_code != 0 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL, NULL, NULL );
+               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                       NULL, NULL, NULL, NULL );
 
        } else {
-               send_ldap_result( conn, op, LDAP_SUCCESS, NULL, NULL, NULL );
+               send_ldap_result( conn, op, LDAP_SUCCESS,
+                       NULL, NULL, NULL, NULL );
        }
 
        Debug( LDAP_DEBUG_ANY, "Perl MODRDN\n", 0, 0, 0 );

diff --git a/servers/slapd/back-perl/search.c b/servers/slapd/back-perl/search.c
index b8451e7d8e0f17b674f887554932633a5038e0e4..0a2558a148e761f804ca942c9186894532406f11 100644 (file)
--- a/servers/slapd/back-perl/search.c
+++ b/servers/slapd/back-perl/search.c
@@ -86,13 +86,8 @@ perl_back_search(
                                        Debug( LDAP_DEBUG_ANY, "str2entry(%s) failed\n", buf, 0, 0 );
 
                                } else {
-                                       send_search_entry( be,
-                                                          conn,
-                                                          op,
-                                                          e,
-                                                          attrs,
-                                                          attrsonly,
-                                                          0 );
+                                       send_search_entry( be, conn, op,
+                                               e, attrs, attrsonly, NULL, 0 );
                                                         
                                        entry_free( e );
                                }
@@ -118,10 +113,12 @@ perl_back_search(
        ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );        
 
        if( return_code != 0 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL, NULL, NULL );
+               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                       NULL, NULL, NULL, NULL );
 
        } else {
-               send_ldap_result( conn, op, LDAP_SUCCESS, NULL, NULL, NULL );
+               send_ldap_result( conn, op, LDAP_SUCCESS,
+                       NULL, NULL, NULL, NULL );
        }
 }
 

diff --git a/servers/slapd/back-shell/add.c b/servers/slapd/back-shell/add.c
index 10c51b02c7c104ebb31ab9d73674996517a9d61d..9c033e7be853b8d73811bd3a0f7332b703db0bff 100644 (file)
--- a/servers/slapd/back-shell/add.c
+++ b/servers/slapd/back-shell/add.c
@@ -24,13 +24,13 @@ shell_back_add(
 
        if ( si->si_add == NULL ) {
                send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                   "add not implemented", NULL );
+                   "add not implemented", NULL, NULL );
                return( -1 );
        }
 
        if ( (op->o_private = (void *) forkandexec( si->si_add, &rfp, &wfp )) == (void *) -1 ) {
                send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
-                   "could not fork/exec", 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 ffb3542181f903309b1732d50da06263420fa5f1..1b61eeb778a584bdc624c72b9d71a6696cc3b4f6 100644 (file)
--- a/servers/slapd/back-shell/bind.c
+++ b/servers/slapd/back-shell/bind.c
@@ -30,14 +30,14 @@ shell_back_bind(
 
        if ( si->si_bind == NULL ) {
                send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                   "bind not implemented", NULL );
+                   "bind not implemented", NULL, NULL );
                return( -1 );
        }
 
        if ( (op->o_private = (void *) forkandexec( si->si_bind, &rfp, &wfp ))
            == (void *) -1 ) {
                send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
-                   "could not fork/exec", 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 780fea125693eb641a571d1939dc40a91d0b4aaa..c59ac342893e672c7c613a9fe9a582a8b9b1e324 100644 (file)
--- a/servers/slapd/back-shell/compare.c
+++ b/servers/slapd/back-shell/compare.c
@@ -24,14 +24,14 @@ shell_back_compare(
 
        if ( si->si_compare == NULL ) {
                send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                   "compare not implemented", NULL );
+                   "compare not implemented", NULL, NULL );
                return( -1 );
        }
 
        if ( (op->o_private = (void *) forkandexec( si->si_compare, &rfp, &wfp ))
            == (void *) -1 ) {
                send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
-                   "could not fork/exec", 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 dc0617d86514c67b3c9a648df1a4faf04f4530f9..1956969fbec3a25da323ed6a8f175ddc773ac1f6 100644 (file)
--- a/servers/slapd/back-shell/delete.c
+++ b/servers/slapd/back-shell/delete.c
@@ -23,14 +23,14 @@ shell_back_delete(
 
        if ( si->si_delete == NULL ) {
                send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                   "delete not implemented", NULL );
+                   "delete not implemented", NULL, NULL );
                return( -1 );
        }
 
        if ( (op->o_private = (void *) forkandexec( si->si_delete, &rfp, &wfp ))
            == (void *) -1 ) {
                send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
-                   "could not fork/exec", 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 ac6cefaed708ee1c4497a121061035f8423c2d27..ebaa3f10e960246e5935060bdd5a7b9fa8218e73 100644 (file)
--- a/servers/slapd/back-shell/modify.c
+++ b/servers/slapd/back-shell/modify.c
@@ -25,14 +25,14 @@ shell_back_modify(
 
        if ( si->si_modify == NULL ) {
                send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                   "modify not implemented", NULL );
+                   "modify not implemented", NULL, NULL );
                return( -1 );
        }
 
        if ( (op->o_private = (void *) forkandexec( si->si_modify, &rfp, &wfp ))
            == (void *) -1 ) {
                send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
-                   "could not fork/exec", 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 b208d606a30d1c1bbcd1a61f8a10f610bfe07736..c04e83a3757427705094778fd0c58ef48958d055 100644 (file)
--- a/servers/slapd/back-shell/modrdn.c
+++ b/servers/slapd/back-shell/modrdn.c
@@ -39,14 +39,14 @@ shell_back_modrdn(
 
        if ( si->si_modrdn == NULL ) {
                send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                   "modrdn not implemented", NULL );
+                   "modrdn not implemented", NULL, NULL );
                return( -1 );
        }
 
        if ( (op->o_private = (void *) forkandexec( si->si_modrdn, &rfp, &wfp ))
            == (void *) -1 ) {
                send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
-                   "could not fork/exec", NULL );
+                   "could not fork/exec", NULL, NULL );
                return( -1 );
        }
 

diff --git a/servers/slapd/back-shell/result.c b/servers/slapd/back-shell/result.c
index b15d3f3e8dc4bd9d5b17c7d13909b2a3bdf89f6c..a0182de9697ecc52bdbf9473e2201efc4bdd6661 100644 (file)
--- a/servers/slapd/back-shell/result.c
+++ b/servers/slapd/back-shell/result.c
@@ -59,7 +59,7 @@ read_and_send_results(
                                    buf, 0, 0 );
                        } else {
                                send_search_entry( be, conn, op, e, attrs,
-                                   attrsonly, 0 );
+                                   attrsonly, NULL, 0 );
                                entry_free( e );
                        }
 
@@ -70,7 +70,7 @@ read_and_send_results(
 
        /* otherwise, front end will send this result */
        if ( err != 0 || op->o_tag != LDAP_REQ_BIND ) {
-               send_ldap_result( conn, op, err, matched, info, NULL );
+               send_ldap_result( conn, op, err, matched, info, NULL, NULL );
        }
 
        free( buf );

diff --git a/servers/slapd/back-shell/search.c b/servers/slapd/back-shell/search.c
index ae2aba312c8f93eb55fbf8948f9e9265e32500e7..6f2bbb8d74fb58905ce2e25901778b7e992b7074 100644 (file)
--- a/servers/slapd/back-shell/search.c
+++ b/servers/slapd/back-shell/search.c
@@ -34,14 +34,14 @@ shell_back_search(
 
        if ( si->si_search == NULL ) {
                send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                   "search not implemented", NULL );
+                   "search not implemented", NULL, NULL );
                return( -1 );
        }
 
        if ( (op->o_private = (void *) forkandexec( si->si_search, &rfp, &wfp ))
            == (void *) -1 ) {
                send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
-                   "could not fork/exec", NULL );
+                   "could not fork/exec", NULL, NULL );
                return( -1 );
        }
 

diff --git a/servers/slapd/back-shell/unbind.c b/servers/slapd/back-shell/unbind.c
index 63d628eacdcbb531a0d0fcf02f2957f9d5f14e1d..f90792d8760661a27c470f6d7b480d96e3fef745 100644 (file)
--- a/servers/slapd/back-shell/unbind.c
+++ b/servers/slapd/back-shell/unbind.c
@@ -22,14 +22,14 @@ shell_back_unbind(
 
        if ( si->si_unbind == NULL ) {
                send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                   "unbind not implemented", NULL );
+                   "unbind not implemented", NULL, NULL );
                return 0;
        }
 
        if ( (op->o_private = (void *) forkandexec( si->si_unbind, &rfp, &wfp ))
            == (void *) -1 ) {
                send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
-                   "could not fork/exec", NULL );
+                   "could not fork/exec", NULL, NULL );
                return 0;
        }