From fb0f6eeeb4ada5c52df85660f4637a228af021e5 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 2 Jun 2003 20:20:45 +0000
Subject: [PATCH] Axe abandon support

---
 servers/slapd/back-shell/Makefile.in |  4 +-
 servers/slapd/back-shell/abandon.c   | 61 ----------------------------
 servers/slapd/back-shell/config.c    | 10 -----
 servers/slapd/back-shell/external.h  |  2 -
 servers/slapd/back-shell/init.c      |  2 +-
 servers/slapd/back-shell/shell.h     |  1 -
 6 files changed, 3 insertions(+), 77 deletions(-)
 delete mode 100644 servers/slapd/back-shell/abandon.c

diff --git a/servers/slapd/back-shell/Makefile.in b/servers/slapd/back-shell/Makefile.in
index 23c2a66be3..ad9ea914de 100644
--- a/servers/slapd/back-shell/Makefile.in
+++ b/servers/slapd/back-shell/Makefile.in
@@ -3,9 +3,9 @@
 ## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 
 SRCS	= init.c config.c fork.c search.c bind.c unbind.c add.c \
-		delete.c modify.c modrdn.c compare.c abandon.c result.c
+		delete.c modify.c modrdn.c compare.c result.c
 OBJS	= init.lo config.lo fork.lo search.lo bind.lo unbind.lo add.lo \
-		delete.lo modify.lo modrdn.lo compare.lo abandon.lo result.lo
+		delete.lo modify.lo modrdn.lo compare.lo result.lo
 
 LDAP_INCDIR= ../../../include       
 LDAP_LIBDIR= ../../../libraries
diff --git a/servers/slapd/back-shell/abandon.c b/servers/slapd/back-shell/abandon.c
deleted file mode 100644
index 040a9993b6..0000000000
--- a/servers/slapd/back-shell/abandon.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* abandon.c - shell backend abandon function */
-/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-
-#include "portable.h"
-
-#include <stdio.h>
-
-#include <ac/socket.h>
-#include <ac/string.h>
-
-#include "slap.h"
-#include "shell.h"
-
-int
-shell_back_abandon(
-    Operation	*op,
-    SlapReply	*rs )
-{
-	struct shellinfo	*si = (struct shellinfo *) op->o_bd->be_private;
-	FILE			*rfp, *wfp;
-	pid_t			pid;
-	Operation		*o;
-
-	if ( si->si_abandon == NULL ) {
-		return 0;
-	}
-
-	pid = -1;
-	LDAP_STAILQ_FOREACH( o, &op->o_conn->c_ops, o_next ) {
-		if ( o->o_msgid == op->oq_abandon.rs_msgid ) {
-			pid = (pid_t) o->o_private;
-			break;
-		}
-	}
-
-	if ( pid == -1 ) {
-		Debug( LDAP_DEBUG_ARGS, "shell could not find op %ld\n",
-		       (long) op->oq_abandon.rs_msgid, 0, 0 );
-		return 0;
-	}
-
-	if ( forkandexec( si->si_abandon, &rfp, &wfp ) == -1 ) {
-		return 0;
-	}
-
-	/* write out the request to the abandon process */
-	fprintf( wfp, "ABANDON\n" );
-	fprintf( wfp, "msgid: %d\n", op->oq_abandon.rs_msgid );
-	print_suffixes( wfp, op->o_bd );
-	fprintf( wfp, "pid: %ld\n", (long) pid );
-	fclose( wfp );
-
-	/* no result from abandon */
-	fclose( rfp );
-
-	return 0;
-}
diff --git a/servers/slapd/back-shell/config.c b/servers/slapd/back-shell/config.c
index a9ec0a95ea..d15e6264d1 100644
--- a/servers/slapd/back-shell/config.c
+++ b/servers/slapd/back-shell/config.c
@@ -112,16 +112,6 @@ shell_back_db_config(
 		}
 		si->si_delete = ldap_charray_dup( &argv[1] );
 
-	/* command + args to exec for abandon */
-	} else if ( strcasecmp( argv[0], "abandon" ) == 0 ) {
-		if ( argc < 2 ) {
-			fprintf( stderr,
-	"%s: line %d: missing executable in \"abandon <executable>\" line\n",
-			    fname, lineno );
-			return( 1 );
-		}
-		si->si_abandon = ldap_charray_dup( &argv[1] );
-
 	/* anything else */
 	} else {
 		fprintf( stderr,
diff --git a/servers/slapd/back-shell/external.h b/servers/slapd/back-shell/external.h
index 1d58992ea3..ec275c91fc 100644
--- a/servers/slapd/back-shell/external.h
+++ b/servers/slapd/back-shell/external.h
@@ -34,8 +34,6 @@ extern BI_op_add	shell_back_add;
 
 extern BI_op_delete	shell_back_delete;
 
-extern BI_op_abandon	shell_back_abandon;
-
 LDAP_END_DECL
 
 #endif /* _SHELL_EXTERNAL_H */
diff --git a/servers/slapd/back-shell/init.c b/servers/slapd/back-shell/init.c
index cfb5357dd0..1b68bfdf7e 100644
--- a/servers/slapd/back-shell/init.c
+++ b/servers/slapd/back-shell/init.c
@@ -53,7 +53,7 @@ shell_back_initialize(
 	bi->bi_op_modrdn = shell_back_modrdn;
 	bi->bi_op_add = shell_back_add;
 	bi->bi_op_delete = shell_back_delete;
-	bi->bi_op_abandon = shell_back_abandon;
+	bi->bi_op_abandon = 0;
 
 	bi->bi_extended = 0;
 
diff --git a/servers/slapd/back-shell/shell.h b/servers/slapd/back-shell/shell.h
index 86b9a0bb8c..93cd28fcda 100644
--- a/servers/slapd/back-shell/shell.h
+++ b/servers/slapd/back-shell/shell.h
@@ -21,7 +21,6 @@ struct shellinfo {
 	char	**si_modrdn;	/* cmd + args to exec for modrdn  */
 	char	**si_add;		/* cmd + args to exec for add	  */
 	char	**si_delete;	/* cmd + args to exec for delete  */
-	char	**si_abandon;	/* cmd + args to exec for abandon */
 };
 
 struct slap_backend_db;