From de97928160ce23c3ed797b4c0dccbcc0c0a7b20a Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 1 Jan 2002 11:38:30 +0000 Subject: [PATCH] Remove abandon cruft --- servers/slapd/back-bdb/external.h | 4 +-- servers/slapd/back-bdb/init.c | 7 ++-- servers/slapd/back-ldbm/abandon.c | 14 -------- servers/slapd/back-ldbm/external.h | 2 -- servers/slapd/back-ldbm/init.c | 2 +- servers/slapd/back-monitor/abandon.c | 52 --------------------------- servers/slapd/back-monitor/external.h | 1 - servers/slapd/back-monitor/init.c | 2 +- 8 files changed, 6 insertions(+), 78 deletions(-) delete mode 100644 servers/slapd/back-ldbm/abandon.c delete mode 100644 servers/slapd/back-monitor/abandon.c diff --git a/servers/slapd/back-bdb/external.h b/servers/slapd/back-bdb/external.h index 7f17d257e7..a0cbe781b7 100644 --- a/servers/slapd/back-bdb/external.h +++ b/servers/slapd/back-bdb/external.h @@ -21,15 +21,13 @@ extern BI_op_compare bdb_compare; extern BI_op_delete bdb_delete; -extern BI_op_abandon bdb_abandon; - extern BI_op_modify bdb_modify; extern BI_op_modrdn bdb_modrdn; extern BI_op_search bdb_search; -extern BI_op_unbind bdb_unbind; +extern BI_op_extended bdb_extended; extern BI_chk_referrals bdb_referrals; diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c index 8150c35b76..e61960b282 100644 --- a/servers/slapd/back-bdb/init.c +++ b/servers/slapd/back-bdb/init.c @@ -436,13 +436,12 @@ bdb_initialize( bi->bi_op_modrdn = bdb_modrdn; bi->bi_op_search = bdb_search; -#if 0 - bi->bi_op_unbind = bdb_unbind; - bi->bi_op_abandon = bdb_abandon; + bi->bi_op_unbind = 0; + bi->bi_op_abandon = 0; bi->bi_extended = bdb_extended; bi->bi_acl_group = bdb_group; -#endif + bi->bi_acl_attribute = bdb_attribute; bi->bi_chk_referrals = bdb_referrals; diff --git a/servers/slapd/back-ldbm/abandon.c b/servers/slapd/back-ldbm/abandon.c deleted file mode 100644 index a89dea223a..0000000000 --- a/servers/slapd/back-ldbm/abandon.c +++ /dev/null @@ -1,14 +0,0 @@ -/* abandon.c - ldbm backend abandon routine */ -/* $OpenLDAP$ */ -/* - * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file - */ - -#include "portable.h" - -/*ARGSUSED*/ -void -ldbm_back_abandon() -{ -} diff --git a/servers/slapd/back-ldbm/external.h b/servers/slapd/back-ldbm/external.h index 464d56d4ac..a683f53e57 100644 --- a/servers/slapd/back-ldbm/external.h +++ b/servers/slapd/back-ldbm/external.h @@ -39,8 +39,6 @@ extern BI_op_add ldbm_back_add; extern BI_op_delete ldbm_back_delete; -extern BI_op_abandon ldbm_back_abandon; - extern BI_acl_group ldbm_back_group; extern BI_acl_attribute ldbm_back_attribute; diff --git a/servers/slapd/back-ldbm/init.c b/servers/slapd/back-ldbm/init.c index ff836b9cb9..a8c9b31b01 100644 --- a/servers/slapd/back-ldbm/init.c +++ b/servers/slapd/back-ldbm/init.c @@ -61,7 +61,7 @@ ldbm_back_initialize( bi->bi_op_modrdn = ldbm_back_modrdn; bi->bi_op_add = ldbm_back_add; bi->bi_op_delete = ldbm_back_delete; - bi->bi_op_abandon = ldbm_back_abandon; + bi->bi_op_abandon = 0; bi->bi_extended = ldbm_back_extended; diff --git a/servers/slapd/back-monitor/abandon.c b/servers/slapd/back-monitor/abandon.c deleted file mode 100644 index 79b58f913f..0000000000 --- a/servers/slapd/back-monitor/abandon.c +++ /dev/null @@ -1,52 +0,0 @@ -/* abandon.c - monitor backend abandon routine */ -/* - * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file - */ -/* - * Copyright 2001 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file - * - * Copyright 2001, Pierangelo Masarati, All rights reserved. - * - * This work has beed deveolped for the OpenLDAP Foundation - * in the hope that it may be useful to the Open Source community, - * but WITHOUT ANY WARRANTY. - * - * Permission is granted to anyone to use this software for any purpose - * on any computer system, and to alter it and redistribute it, subject - * to the following restrictions: - * - * 1. The author and SysNet s.n.c. are not responsible for the consequences - * of use of this software, no matter how awful, even if they arise from - * flaws in it. - * - * 2. The origin of this software must not be misrepresented, either by - * explicit claim or by omission. Since few users ever read sources, - * credits should appear in the documentation. - * - * 3. Altered versions must be plainly marked as such, and must not be - * misrepresented as being the original software. Since few users - * ever read sources, credits should appear in the documentation. - * SysNet s.n.c. cannot be responsible for the consequences of the - * alterations. - * - * 4. This notice may not be removed or altered. - */ - -#include "portable.h" - -#include -#include "back-monitor.h" - -int -monitor_back_abandon( - BackendDB *be, - struct slap_conn *c, - struct slap_op *o, - ber_int_t msgid -) -{ - return( 0 ); -} - diff --git a/servers/slapd/back-monitor/external.h b/servers/slapd/back-monitor/external.h index 00d0d2fdce..b10b90e364 100644 --- a/servers/slapd/back-monitor/external.h +++ b/servers/slapd/back-monitor/external.h @@ -48,7 +48,6 @@ extern BI_db_destroy monitor_back_db_destroy; extern BI_op_search monitor_back_search; extern BI_op_compare monitor_back_compare; -extern BI_op_abandon monitor_back_abandon; extern BI_op_modify monitor_back_modify; extern BI_op_bind monitor_back_bind; extern BI_operational monitor_back_operational; diff --git a/servers/slapd/back-monitor/init.c b/servers/slapd/back-monitor/init.c index 652bcfc7d9..1f4e848fc2 100644 --- a/servers/slapd/back-monitor/init.c +++ b/servers/slapd/back-monitor/init.c @@ -182,7 +182,7 @@ monitor_back_initialize( bi->bi_op_modrdn = 0; bi->bi_op_add = 0; bi->bi_op_delete = 0; - bi->bi_op_abandon = monitor_back_abandon; + bi->bi_op_abandon = 0; bi->bi_extended = 0; -- 2.39.5