From 956863ff006e99312ed9b42d682fadd6c9bb9372 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Mon, 12 Jul 1999 23:17:38 +0000 Subject: [PATCH] Make other backends (excepting BDB2) compile. Integration of BDB2 changes will be deferred until after LDBM work is completed. --- servers/slapd/back-ldap/bind.c | 4 ++-- servers/slapd/back-ldap/search.c | 5 +++-- servers/slapd/back-passwd/search.c | 19 ++++++++++++------- servers/slapd/back-perl/add.c | 6 ++++-- servers/slapd/back-perl/compare.c | 2 +- servers/slapd/back-perl/delete.c | 6 ++++-- servers/slapd/back-perl/modify.c | 6 ++++-- servers/slapd/back-perl/modrdn.c | 6 ++++-- servers/slapd/back-perl/search.c | 15 ++++++--------- servers/slapd/back-shell/add.c | 4 ++-- servers/slapd/back-shell/bind.c | 4 ++-- servers/slapd/back-shell/compare.c | 4 ++-- servers/slapd/back-shell/delete.c | 4 ++-- servers/slapd/back-shell/modify.c | 4 ++-- servers/slapd/back-shell/modrdn.c | 4 ++-- servers/slapd/back-shell/result.c | 4 ++-- servers/slapd/back-shell/search.c | 4 ++-- servers/slapd/back-shell/unbind.c | 4 ++-- 18 files changed, 58 insertions(+), 47 deletions(-) diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c index a0352f17c4..d57364a637 100644 --- 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 b0f0930ad4..d0a5cf688c 100644 --- 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 752517c1ca..90e8a52e78 100644 --- 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 4e9fa2d1a0..89193b499a 100644 --- 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 d66d94fd2b..482cdd06d5 100644 --- 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 f32b38eb2e..53acb19945 100644 --- 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 19a83c412b..025823e081 100644 --- 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 125bd7157e..5fa8bca123 100644 --- 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 b8451e7d8e..0a2558a148 100644 --- 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 10c51b02c7..9c033e7be8 100644 --- 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 ffb3542181..1b61eeb778 100644 --- 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 780fea1256..c59ac34289 100644 --- 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 dc0617d865..1956969fbe 100644 --- 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 ac6cefaed7..ebaa3f10e9 100644 --- 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 b208d606a3..c04e83a375 100644 --- 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 b15d3f3e8d..a0182de969 100644 --- 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 ae2aba312c..6f2bbb8d74 100644 --- 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 63d628eacd..f90792d876 100644 --- 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; } -- 2.39.5