Skip to content
GitLab
Commit 3a931043 authored by Ralf Haferkamp's avatar Ralf Haferkamp
Browse files

Reworked recent backend API changes, now using a separate struct, 

(ConfigReply) for the error messages.
parent 34921e07
Expand all Hide whitespace changes
Inline Side-by-side
servers/slapd/back-bdb/init.c
View file @ 3a931043
......@@ -47,7 +47,7 @@ typedef void * db_realloc(void *, size_t);
#define bdb_db_close BDB_SYMBOL(db_close)
static int
bdb_db_init( BackendDB *be, ConfigArgs *ca )
bdb_db_init( BackendDB *be, ConfigReply *cr )
{
struct bdb_info *bdb;
int rc;
......@@ -94,10 +94,10 @@ bdb_db_init( BackendDB *be, ConfigArgs *ca )
}
static int
bdb_db_close( BackendDB *be, ConfigArgs *ca );
bdb_db_close( BackendDB *be, ConfigReply *cr );
static int
bdb_db_open( BackendDB *be, ConfigArgs *ca )
bdb_db_open( BackendDB *be, ConfigReply *cr )
{
int rc, i;
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
......@@ -122,8 +122,11 @@ bdb_db_open( BackendDB *be, ConfigArgs *ca )
#ifndef BDB_MULTIPLE_SUFFIXES
if ( be->be_suffix[1].bv_val ) {
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(bdb_db_open) ": only one suffix allowed\n", 0, 0, 0 );
if (cr) {
snprintf(cr->msg, sizeof(cr->msg), "only one suffix allowed");
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(bdb_db_open) ": %s\n", cr->msg, 0, 0 );
}
return -1;
}
#endif
......@@ -480,7 +483,7 @@ fail:
}
static int
bdb_db_close( BackendDB *be, ConfigArgs *ca )
bdb_db_close( BackendDB *be, ConfigReply *cr )
{
int rc;
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
......@@ -575,7 +578,7 @@ bdb_db_close( BackendDB *be, ConfigArgs *ca )
}
static int
bdb_db_destroy( BackendDB *be, ConfigArgs *ca )
bdb_db_destroy( BackendDB *be, ConfigReply *cr )
{
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
......
servers/slapd/back-dnssrv/init.c
View file @ 3a931043
......@@ -93,7 +93,7 @@ dnssrv_back_open(
int
dnssrv_back_db_init(
Backend *be,
ConfigArgs *ca)
ConfigReply *cr)
{
return 0;
}
......@@ -101,7 +101,7 @@ dnssrv_back_db_init(
int
dnssrv_back_db_destroy(
Backend *be,
ConfigArgs *ca )
ConfigReply *cr )
{
return 0;
}
......
servers/slapd/back-ldap/chain.c
View file @ 3a931043
......@@ -1217,9 +1217,9 @@ ldap_chain_cfadd_apply( void *datum, void *arg )
struct berval bv;
/* FIXME: should not hardcode "olcDatabase" here */
bv.bv_len = snprintf( lca->ca->msg, sizeof( lca->ca->msg ),
bv.bv_len = snprintf( lca->ca->cr_msg, sizeof( lca->ca->cr_msg ),
"olcDatabase={%d}%s", lca->count, lback->bi_type );
bv.bv_val = lca->ca->msg;
bv.bv_val = lca->ca->cr_msg;
lca->ca->be->be_private = (void *)li;
config_build_entry( lca->op, lca->rs, lca->p->e_private, lca->ca,
......@@ -1479,11 +1479,11 @@ chain_cf_gen( ConfigArgs *c )
case CH_MAX_DEPTH:
if ( c->value_int < 0 ) {
snprintf( c->msg, sizeof( c->msg ),
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"<%s> invalid max referral depth %d",
c->argv[0], c->value_int );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
c->log, c->msg, 0 );
c->log, c->cr_msg, 0 );
rc = 1;
break;
}
......@@ -1507,7 +1507,7 @@ chain_cf_gen( ConfigArgs *c )
static int
ldap_chain_db_init(
BackendDB *be,
ConfigArgs *ca )
ConfigReply *cr )
{
slap_overinst *on = (slap_overinst *)be->bd_info;
ldap_chain_t *lc = NULL;
......@@ -1739,7 +1739,7 @@ ldap_chain_db_func(
static int
ldap_chain_db_open(
BackendDB *be,
ConfigArgs *ca )
ConfigReply *cr )
{
slap_overinst *on = (slap_overinst *) be->bd_info;
ldap_chain_t *lc = (ldap_chain_t *)on->on_bi.bi_private;
......@@ -1772,7 +1772,7 @@ ldap_chain_db_open(
static int
ldap_chain_db_close(
BackendDB *be,
ConfigArgs *ca )
ConfigReply *cr )
{
return ldap_chain_db_func( be, db_close );
}
......@@ -1780,7 +1780,7 @@ ldap_chain_db_close(
static int
ldap_chain_db_destroy(
BackendDB *be,
ConfigArgs *ca )
ConfigReply *cr )
{
slap_overinst *on = (slap_overinst *) be->bd_info;
ldap_chain_t *lc = (ldap_chain_t *)on->on_bi.bi_private;
......
servers/slapd/back-ldap/config.c
View file @ 3a931043
......@@ -554,11 +554,11 @@ slap_idassert_authzfrom_parse( ConfigArgs *c, slap_idassert_t *si )
|| strcasecmp( c->argv[ 1 ], "dn.regex:.*" ) == 0 )
{
if ( si->si_authz != NULL ) {
snprintf( c->msg, sizeof( c->msg ),
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"\"idassert-authzFrom <authz>\": "
"\"%s\" conflicts with existing authz rules",
c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
}
......@@ -567,20 +567,20 @@ slap_idassert_authzfrom_parse( ConfigArgs *c, slap_idassert_t *si )
return 0;
} else if ( ( si->si_flags & LDAP_BACK_AUTH_AUTHZ_ALL ) ) {
snprintf( c->msg, sizeof( c->msg ),
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"\"idassert-authzFrom <authz>\": "
"\"<authz>\" conflicts with \"*\"" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
}
ber_str2bv( c->argv[ 1 ], 0, 0, &in );
rc = authzNormalize( 0, NULL, NULL, &in, &bv, NULL );
if ( rc != LDAP_SUCCESS ) {
snprintf( c->msg, sizeof( c->msg ),
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"\"idassert-authzFrom <authz>\": "
"invalid syntax" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
}
......@@ -601,11 +601,11 @@ slap_idassert_parse( ConfigArgs *c, slap_idassert_t *si )
j = verb_to_mask( argvi, idassert_mode );
if ( BER_BVISNULL( &idassert_mode[ j ].word ) ) {
snprintf( c->msg, sizeof( c->msg ),
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"\"idassert-bind <args>\": "
"unknown mode \"%s\"",
argvi );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
}
......@@ -616,11 +616,11 @@ slap_idassert_parse( ConfigArgs *c, slap_idassert_t *si )
if ( strcasecmp( argvi, "native" ) == 0 ) {
if ( si->si_bc.sb_method != LDAP_AUTH_SASL ) {
snprintf( c->msg, sizeof( c->msg ),
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"\"idassert-bind <args>\": "
"authz=\"native\" incompatible "
"with auth method" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
}
si->si_flags |= LDAP_BACK_AUTH_NATIVE_AUTHZ;
......@@ -629,11 +629,11 @@ slap_idassert_parse( ConfigArgs *c, slap_idassert_t *si )
si->si_flags &= ~LDAP_BACK_AUTH_NATIVE_AUTHZ;
} else {
snprintf( c->msg, sizeof( c->msg ),
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"\"idassert-bind <args>\": "
"unknown authz \"%s\"",
argvi );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
}
......@@ -643,11 +643,11 @@ slap_idassert_parse( ConfigArgs *c, slap_idassert_t *si )
int j, err = 0;
if ( flags == NULL ) {
snprintf( c->msg, sizeof( c->msg ),
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"\"idassert-bind <args>\": "
"unable to parse flags \"%s\"",
argvi );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
}
......@@ -691,11 +691,11 @@ slap_idassert_parse( ConfigArgs *c, slap_idassert_t *si )
}
} else {
snprintf( c->msg, sizeof( c->msg ),
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"\"idassert-bind <args>\": "
"unknown flag \"%s\"",
flags[ j ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
err = 1;
break;
}
......@@ -1297,11 +1297,11 @@ ldap_back_cf_gen( ConfigArgs *c )
why = "unknown reason";
break;
}
snprintf( c->msg, sizeof( c->msg),
snprintf( c->cr_msg, sizeof( c->cr_msg),
"unable to parse uri \"%s\" "
"in \"uri <uri>\" line: %s",
c->value_string, why );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
urlrc = 1;
goto done_url;
}
......@@ -1317,13 +1317,13 @@ ldap_back_cf_gen( ConfigArgs *c )
|| tmpludp->lud_filter != NULL
|| tmpludp->lud_exts != NULL )
{
snprintf( c->msg, sizeof( c->msg ),
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"warning, only protocol, "
"host and port allowed "
"in \"uri <uri>\" statement "
"for uri #%d of \"%s\"",
i, c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
}
}
......@@ -1352,12 +1352,12 @@ ldap_back_cf_gen( ConfigArgs *c )
urllist[ i ] = ldap_url_desc2str( &tmplud );
if ( urllist[ i ] == NULL ) {
snprintf( c->msg, sizeof( c->msg),
snprintf( c->cr_msg, sizeof( c->cr_msg),
"unable to rebuild uri "
"in \"uri <uri>\" statement "
"for \"%s\"",
c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
urlrc = 1;
goto done_url;
}
......@@ -1413,11 +1413,11 @@ done_url:;
break;
default:
snprintf( c->msg, sizeof( c->msg),
snprintf( c->cr_msg, sizeof( c->cr_msg),
"\"acl-authcDN <DN>\" incompatible "
"with auth method %d",
li->li_acl_authmethod );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
}
if ( !BER_BVISNULL( &li->li_acl_authcDN ) ) {
......@@ -1439,11 +1439,11 @@ done_url:;
break;
default:
snprintf( c->msg, sizeof( c->msg ),
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"\"acl-passwd <cred>\" incompatible "
"with auth method %d",
li->li_acl_authmethod );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
}
if ( !BER_BVISNULL( &li->li_acl_passwd ) ) {
......@@ -1558,11 +1558,11 @@ done_url:;
break;
default:
snprintf( c->msg, sizeof( c->msg ),
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"\"idassert-authcDN <DN>\" incompatible "
"with auth method %d",
li->li_idassert_authmethod );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
}
if ( !BER_BVISNULL( &li->li_idassert_authcDN ) ) {
......@@ -1584,11 +1584,11 @@ done_url:;
break;
default:
snprintf( c->msg, sizeof( c->msg ),
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"\"idassert-passwd <cred>\" incompatible "
"with auth method %d",
li->li_idassert_authmethod );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
}
if ( !BER_BVISNULL( &li->li_idassert_passwd ) ) {
......@@ -1603,10 +1603,10 @@ done_url:;
case LDAP_BACK_CFG_IDASSERT_METHOD:
/* no longer supported */
snprintf( c->msg, sizeof( c->msg ),
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"\"idassert-method <args>\": "
"no longer supported; use \"idassert-bind\"" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
case LDAP_BACK_CFG_IDASSERT_BIND:
......@@ -1649,10 +1649,10 @@ done_url:;
int rc;
if ( li->li_uri == NULL ) {
snprintf( c->msg, sizeof( c->msg ),
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"need URI to discover absolute filters support "
"in \"t-f-support discover\"" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
}
......@@ -1691,10 +1691,10 @@ done_url:;
unsigned u;
if ( lutil_atoux( &u, c->argv[ i ], 0 ) != 0 ) {
snprintf( c->msg, sizeof( c->msg),
snprintf( c->cr_msg, sizeof( c->cr_msg),
"unable to parse timeout \"%s\"",
c->argv[ i ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
}
......@@ -1706,10 +1706,10 @@ done_url:;
}
if ( slap_cf_aux_table_parse( c->argv[ i ], li->li_timeout, timeout_table, "slapd-ldap timeout" ) ) {
snprintf( c->msg, sizeof( c->msg),
snprintf( c->cr_msg, sizeof( c->cr_msg),
"unable to parse timeout \"%s\"",
c->argv[ i ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
}
}
......@@ -1719,10 +1719,10 @@ done_url:;
unsigned long t;
if ( lutil_parse_time( c->argv[ 1 ], &t ) != 0 ) {
snprintf( c->msg, sizeof( c->msg),
snprintf( c->cr_msg, sizeof( c->cr_msg),
"unable to parse idle timeout \"%s\"",
c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
}
li->li_idle_timeout = (time_t)t;
......@@ -1732,10 +1732,10 @@ done_url:;
unsigned long t;
if ( lutil_parse_time( c->argv[ 1 ], &t ) != 0 ) {
snprintf( c->msg, sizeof( c->msg),
snprintf( c->cr_msg, sizeof( c->cr_msg),
"unable to parse conn ttl\"%s\"",
c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
}
li->li_conn_ttl = (time_t)t;
......@@ -1745,10 +1745,10 @@ done_url:;
unsigned long t;
if ( lutil_parse_time( c->argv[ 1 ], &t ) != 0 ) {
snprintf( c->msg, sizeof( c->msg),
snprintf( c->cr_msg, sizeof( c->cr_msg),
"unable to parse network timeout \"%s\"",
c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
}
li->li_network_timeout = (time_t)t;
......@@ -1756,11 +1756,11 @@ done_url:;
case LDAP_BACK_CFG_VERSION:
if ( c->value_int != 0 && ( c->value_int < LDAP_VERSION_MIN || c->value_int > LDAP_VERSION_MAX ) ) {
snprintf( c->msg, sizeof( c->msg ),
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"unsupported version \"%s\" "
"in \"protocol-version <version>\"",
c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
}
......@@ -1789,7 +1789,7 @@ done_url:;
if ( c->value_int < LDAP_BACK_CONN_PRIV_MIN
|| c->value_int > LDAP_BACK_CONN_PRIV_MAX )
{
snprintf( c->msg, sizeof( c->msg ),
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"invalid max size " "of privileged "
"connections pool \"%s\" "
"in \"conn-pool-max <n> "
......@@ -1797,7 +1797,7 @@ done_url:;
c->argv[ 1 ],
LDAP_BACK_CONN_PRIV_MIN,
LDAP_BACK_CONN_PRIV_MAX );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
}
li->li_conn_priv_max = c->value_int;
......@@ -1821,10 +1821,10 @@ done_url:;
int rc;
if ( li->li_uri == NULL ) {
snprintf( c->msg, sizeof( c->msg ),
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"need URI to discover \"cancel\" support "
"in \"cancel exop-discover\"" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
}
......@@ -1847,15 +1847,15 @@ done_url:;
case LDAP_BACK_CFG_QUARANTINE:
if ( LDAP_BACK_QUARANTINE( li ) ) {
snprintf( c->msg, sizeof( c->msg ),
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"quarantine already defined" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
}
rc = slap_retry_info_parse( c->argv[1], &li->li_quarantine,
c->msg, sizeof( c->msg ) );
c->cr_msg, sizeof( c->cr_msg ) );
if ( rc ) {
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
} else {
ldap_pvt_thread_mutex_init( &li->li_quarantine_mutex );
......@@ -1867,12 +1867,12 @@ done_url:;
break;
case LDAP_BACK_CFG_REWRITE:
snprintf( c->msg, sizeof( c->msg ),
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"rewrite/remap capabilities have been moved "
"to the \"rwm\" overlay; see slapo-rwm(5) "
"for details (hint: add \"overlay rwm\" "
"and prefix all directives with \"rwm-\")" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
return 1;
default:
......
servers/slapd/back-ldap/distproc.c
View file @ 3a931043
......@@ -472,9 +472,9 @@ ldap_distproc_cfadd_apply( void *datum, void *arg )
struct berval bv;
/* FIXME: should not hardcode "olcDatabase" here */
bv.bv_len = snprintf( lca->ca->msg, sizeof( lca->ca->msg ),
bv.bv_len = snprintf( lca->ca->cr_msg, sizeof( lca->ca->cr_msg ),
"olcDatabase={%d}%s", lca->count, lback->bi_type );
bv.bv_val = lca->ca->msg;
bv.bv_val = lca->ca->cr_msg;
lca->ca->be->be_private = (void *)li;
config_build_entry( lca->op, lca->rs, lca->p->e_private, lca->ca,
......@@ -568,7 +568,7 @@ distproc_cfgen( ConfigArgs *c )
static int
ldap_distproc_db_init(
BackendDB *be,
ConfigArgs *ca )
ConfigReply *cr )
{
slap_overinst *on = (slap_overinst *)be->bd_info;
ldap_distproc_t *lc = NULL;
......@@ -761,7 +761,7 @@ ldap_distproc_db_func(
static int
ldap_distproc_db_open(
BackendDB *be,
ConfigArgs *ca )
ConfigReply *cr )
{
return ldap_distproc_db_func( be, db_open );
}
......@@ -769,7 +769,7 @@ ldap_distproc_db_open(
static int
ldap_distproc_db_close(
BackendDB *be,
ConfigArgs *ca )
ConfigReply *cr )
{
return ldap_distproc_db_func( be, db_close );
}
......@@ -777,7 +777,7 @@ ldap_distproc_db_close(
static int
ldap_distproc_db_destroy(
BackendDB *be,
ConfigArgs *ca )
ConfigReply *cr )
{
slap_overinst *on = (slap_overinst *) be->bd_info;
ldap_distproc_t *lc = (ldap_distproc_t *)on->on_bi.bi_private;
......
servers/slapd/back-ldap/init.c
View file @ 3a931043
......@@ -99,7 +99,7 @@ ldap_back_initialize( BackendInfo *bi )
}
int
ldap_back_db_init( Backend *be, ConfigArgs *ca )
ldap_back_db_init( Backend *be, ConfigReply *cr )
{
ldapinfo_t *li;
int rc;
......@@ -169,7 +169,7 @@ ldap_back_db_init( Backend *be, ConfigArgs *ca )
}
int
ldap_back_db_open( BackendDB *be, ConfigArgs *ca )
ldap_back_db_open( BackendDB *be, ConfigReply *cr )
{
ldapinfo_t *li = (ldapinfo_t *)be->be_private;
......@@ -256,7 +256,7 @@ ldap_back_conn_free( void *v_lc )
}
int
ldap_back_db_close( Backend *be, ConfigArgs *ca )
ldap_back_db_close( Backend *be, ConfigReply *cr )
{
int rc = 0;
......@@ -268,7 +268,7 @@ ldap_back_db_close( Backend *be, ConfigArgs *ca )
}
int
ldap_back_db_destroy( Backend *be, ConfigArgs *ca )
ldap_back_db_destroy( Backend *be, ConfigReply *cr )
{
if ( be->be_private ) {
ldapinfo_t *li = ( ldapinfo_t * )be->be_private;
......
servers/slapd/back-ldif/ldif.c
View file @ 3a931043
......@@ -1214,7 +1214,7 @@ static ID ldif_tool_entry_put(BackendDB * be, Entry * e, struct berval *text) {
}
static int
ldif_back_db_init( BackendDB *be, ConfigArgs *ca )
ldif_back_db_init( BackendDB *be, ConfigReply *cr )
{
struct ldif_info *ni;
......@@ -1226,7 +1226,7 @@ ldif_back_db_init( BackendDB *be, ConfigArgs *ca )
}
static int
ldif_back_db_destroy( Backend *be, ConfigArgs *ca )
ldif_back_db_destroy( Backend *be, ConfigReply *cr )
{
struct ldif_info *ni = be->be_private;