Ready for release

[openldap] / servers / slapd / back-shell / init.c

diff --git a/servers/slapd/back-shell/init.c b/servers/slapd/back-shell/init.c
index 80affe10351418f207c34b87af73252237153d0e..828abc2b5c4802594ef5e53e47c62c8ffd91cac8 100644 (file)
--- a/servers/slapd/back-shell/init.c
+++ b/servers/slapd/back-shell/init.c
@@ -1,5 +1,32 @@
 /* init.c - initialize shell backend */
 /* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* 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"
 
@@ -8,22 +35,8 @@
 #include <ac/socket.h>
 
 #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(
@@ -49,17 +62,11 @@ 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;
-
-#ifdef HAVE_CYRUS_SASL
-       bi->bi_sasl_authorize = 0;
-       bi->bi_sasl_getsecret = 0;
-       bi->bi_sasl_putsecret = 0;
-#endif /* HAVE_CYRUS_SASL */
+       bi->bi_chk_referrals = 0;
 
        bi->bi_connection_init = 0;
        bi->bi_connection_destroy = 0;
@@ -89,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 */
+