From fa4918ec1e2e69604845f244e013301596e93b90 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Sat, 11 Dec 2004 16:28:45 +0000 Subject: [PATCH] (temporary?) fix to ITS#3434 --- servers/slapd/back-relay/config.c | 12 ++++++------ servers/slapd/back-relay/init.c | 2 +- servers/slapd/back-relay/op.c | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/servers/slapd/back-relay/config.c b/servers/slapd/back-relay/config.c index a26918ae5c..3c0c703ec7 100644 --- a/servers/slapd/back-relay/config.c +++ b/servers/slapd/back-relay/config.c @@ -27,11 +27,11 @@ int relay_back_db_config( - BackendDB *be, - const char *fname, - int lineno, - int argc, - char **argv + BackendDB *be, + const char *fname, + int lineno, + int argc, + char **argv ) { relay_back_info *ri = (struct relay_back_info *)be->be_private; @@ -110,7 +110,7 @@ relay_back_db_config( return 1; } - cargv[ 0 ] = "suffixmassage"; + cargv[ 0 ] = "rwm-suffixmassage"; cargv[ 1 ] = be->be_suffix[0].bv_val; cargv[ 2 ] = pdn.bv_val; cargv[ 3 ] = NULL; diff --git a/servers/slapd/back-relay/init.c b/servers/slapd/back-relay/init.c index b397a33d5d..85ab6e1da1 100644 --- a/servers/slapd/back-relay/init.c +++ b/servers/slapd/back-relay/init.c @@ -48,7 +48,7 @@ relay_back_initialize( BackendInfo *bi ) bi->bi_op_modrdn = relay_back_op_modrdn; bi->bi_op_add = relay_back_op_add; bi->bi_op_delete = relay_back_op_delete; - bi->bi_op_abandon = relay_back_op_abandon; + bi->bi_op_abandon = 0 /* relay_back_op_abandon */ ; bi->bi_op_cancel = relay_back_op_cancel; bi->bi_extended = relay_back_op_extended; bi->bi_entry_release_rw = relay_back_entry_release_rw; diff --git a/servers/slapd/back-relay/op.c b/servers/slapd/back-relay/op.c index 881e77a830..e80b591a16 100644 --- a/servers/slapd/back-relay/op.c +++ b/servers/slapd/back-relay/op.c @@ -40,11 +40,11 @@ relay_back_swap_bd( struct slap_op *op, struct slap_rep *rs ) static void relay_back_add_cb( slap_callback *cb, struct slap_op *op ) { - cb->sc_next = op->o_callback; - cb->sc_response = relay_back_swap_bd; - cb->sc_cleanup = relay_back_swap_bd; - cb->sc_private = op->o_bd; - op->o_callback = cb; + cb->sc_next = op->o_callback; + cb->sc_response = relay_back_swap_bd; + cb->sc_cleanup = relay_back_swap_bd; + cb->sc_private = op->o_bd; + op->o_callback = cb; } static BackendDB * @@ -83,7 +83,7 @@ relay_back_select_backend( struct slap_op *op, struct slap_rep *rs, int err ) } else { /* NOTE: err is LDAP_INVALID_CREDENTIALS for bind, * LDAP_NO_SUCH_OBJECT for other operations. - * noSuchObject is not allowed to be returned by bind */ + * noSuchObject cannot be returned by bind */ rs->sr_err = err; send_ldap_result( op, rs ); } -- 2.39.5