fix previous commit

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

diff --git a/servers/slapd/back-perl/init.c b/servers/slapd/back-perl/init.c
index e0f29ba3d48ba604c8498595c92967d8fc287ef8..fef6b782a9bda0338a8d53e6504017a52812d2dc 100644 (file)
--- a/servers/slapd/back-perl/init.c
+++ b/servers/slapd/back-perl/init.c
@@ -1,52 +1,28 @@
 /* $OpenLDAP$ */
-/*
- *      Copyright 1999, John C. Quillan, All rights reserved.
- *      Portions Copyright 2002, myinternet Limited. All rights reserved.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- *      Redistribution and use in source and binary forms are permitted only
- *      as authorized by the OpenLDAP Public License.  A copy of this
- *      license is available at http://www.OpenLDAP.org/license.html or
- *      in file LICENSE in the top-level directory of the distribution.
+ * Copyright 1999-2005 The OpenLDAP Foundation.
+ * Portions Copyright 1999 John C. Quillan.
+ * Portions Copyright 2002 myinternet Limited.
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
-#include "portable.h"
- /* init.c - initialize shell backend */
-       
-#include <stdio.h>
-
-#include "slap.h"
-#ifdef HAVE_WIN32_ASPERL
-#include "asperl_undefs.h"
-#endif
-
-#include <EXTERN.h>
-#include <perl.h>
-
 #include "perl_back.h"
 
-
 static void perl_back_xs_init LDAP_P((PERL_BACK_XS_INIT_PARAMS));
 EXT void boot_DynaLoader LDAP_P((PERL_BACK_BOOT_DYNALOADER_PARAMS));
 
 PerlInterpreter *PERL_INTERPRETER = NULL;
 ldap_pvt_thread_mutex_t        perl_interpreter_mutex;
 
-#ifdef SLAPD_PERL_DYNAMIC
-
-int back_perl_LTX_init_module(int argc, char *argv[])
-{
-       BackendInfo bi;
-
-       memset( &bi, '\0', sizeof(bi) );
-       bi.bi_type = "perl";
-       bi.bi_init = perl_back_initialize;
-
-       backend_add(&bi);
-       return 0;
-}
-
-#endif /* SLAPD_PERL_DYNAMIC */
-
 
 /**********************************************************
  *
@@ -179,3 +155,12 @@ perl_back_xs_init(PERL_BACK_XS_INIT_PARAMS)
        dXSUB_SYS;
        newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
 }
+
+#if SLAPD_PERL == SLAPD_MOD_DYNAMIC
+
+/* conditionally define the init_module() function */
+SLAP_BACKEND_INIT_MODULE( perl )
+
+#endif /* SLAPD_PERL == SLAPD_MOD_DYNAMIC */
+
+