X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-shell%2Finit.c;h=828abc2b5c4802594ef5e53e47c62c8ffd91cac8;hb=4a107089d82ecdaca788fc6ecdef34d3d4fc19df;hp=03ab2d18011c49b48b908b2d9c3e6fcaceae87a7;hpb=4e51bba2176a3dc1bb88944f582afc6049f8ff69;p=openldap
diff --git a/servers/slapd/back-shell/init.c b/servers/slapd/back-shell/init.c
index 03ab2d1801..828abc2b5c 100644
--- a/servers/slapd/back-shell/init.c
+++ b/servers/slapd/back-shell/init.c
@@ -1,8 +1,31 @@
/* init.c - initialize shell backend */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).
*/
#include "portable.h"
@@ -10,25 +33,10 @@
#include
#include
-#include
#include "slap.h"
-#include "shell.h"
-
-#ifdef SLAPD_SHELL_DYNAMIC
-
-int back_shell_LTX_init_module(int argc, char *argv[]) {
- BackendInfo bi;
-
- memset( &bi, '\0', sizeof(bi) );
- bi.bi_type = "shell";
- bi.bi_init = shell_back_initialize;
- backend_add(&bi);
- return 0;
-}
-
-#endif /* SLAPD_SHELL_DYNAMIC */
+#include "shell.h"
int
shell_back_initialize(
@@ -38,7 +46,7 @@ shell_back_initialize(
bi->bi_open = 0;
bi->bi_config = 0;
bi->bi_close = 0;
- bi->bi_destroy = shell_back_destroy;
+ bi->bi_destroy = 0;
bi->bi_db_init = shell_back_db_init;
bi->bi_db_config = shell_back_db_config;
@@ -54,43 +62,15 @@ 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;
- bi->bi_acl_group = 0;
- bi->bi_acl_attribute = 0;
bi->bi_chk_referrals = 0;
bi->bi_connection_init = 0;
bi->bi_connection_destroy = 0;
-#ifdef SHELL_SURROGATE_PARENT
- ldap_pvt_thread_mutex_init( &shell_surrogate_index_mutex );
- ldap_pvt_thread_mutex_init( &shell_surrogate_fd_mutex[0] );
- ldap_pvt_thread_mutex_init( &shell_surrogate_fd_mutex[1] );
-#endif
-
- return 0;
-}
-
-int
-shell_back_destroy(
- BackendInfo *bi
-)
-{
-#ifdef SHELL_SURROGATE_PARENT
- ldap_pvt_thread_mutex_destroy( &shell_surrogate_index_mutex );
- ldap_pvt_thread_mutex_destroy( &shell_surrogate_fd_mutex[0] );
- ldap_pvt_thread_mutex_destroy( &shell_surrogate_fd_mutex[1] );
- if ( shell_surrogate_fd[0] >= 0 ) {
- close( shell_surrogate_fd[0] );
- close( shell_surrogate_fd[1] );
- }
- if ( shell_surrogate_pid >= 0 )
- kill( shell_surrogate_pid, SIGTERM );
-#endif
-
return 0;
}
@@ -101,11 +81,6 @@ shell_back_db_init(
{
struct shellinfo *si;
-#ifdef SHELL_SURROGATE_PARENT
- if ( shell_surrogate_fd[0] < 0 )
- make_surrogate_parent();
-#endif
-
si = (struct shellinfo *) ch_calloc( 1, sizeof(struct shellinfo) );
be->be_private = si;
@@ -121,3 +96,11 @@ shell_back_db_destroy(
free( be->be_private );
return 0;
}
+
+#if SLAPD_SHELL == SLAPD_MOD_DYNAMIC
+
+/* conditionally define the init_module() function */
+SLAP_BACKEND_INIT_MODULE( shell )
+
+#endif /* SLAPD_SHELL == SLAPD_MOD_DYNAMIC */
+