Remove abandon cruft

diff --git a/servers/slapd/back-bdb/external.h b/servers/slapd/back-bdb/external.h
index 7f17d257e739e125be43b838d51f76a7d1338d59..a0cbe781b7df08b855467532a109b0bb666f094c 100644 (file)
--- 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 8150c35b76f2b01232de1ab639dbd20f93bb04e5..e61960b28225631f655869cef2d9ee1e8891d31d 100644 (file)
--- 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 (file)
index a89dea2..0000000
--- 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 464d56d4acd8b8e6e975db6fe81c0ad1c746e95c..a683f53e570bf6ef5fce13d2cc29954e148c9cf6 100644 (file)
--- 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 ff836b9cb951262796887a852fdb3a106fd8f09f..a8c9b31b0185c8e827d9d41512b11422b83c0657 100644 (file)
--- 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 (file)
index 79b58f9..0000000
--- 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. <ando@sys-net.it>
- * 
- * 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 <slap.h>
-#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 00d0d2fdce900cfe82f95a0bf8e029bcca74b1ef..b10b90e364d623936938822ac41369026188060b 100644 (file)
--- 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 652bcfc7d965f92ce99d411a2d8f2110456b8a75..1f4e848fc2ff77727abb1d740486551e9c4cf72d 100644 (file)
--- 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;