Format %d -> %ld.

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

diff --git a/servers/slapd/back-perl/config.c b/servers/slapd/back-perl/config.c
index 41f36a9a2473ae88a565a62e93d0db13a6133e57..63878e1d9b42b96720967dff6c46b21fac5d1e7d 100644 (file)
--- a/servers/slapd/back-perl/config.c
+++ b/servers/slapd/back-perl/config.c
@@ -1,5 +1,11 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1999-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  *      Copyright 1999, John C. Quillan, All rights reserved.
+ *      Portions Copyright 2002, myinternet Limited. All rights reserved.
  *
  *      Redistribution and use in source and binary forms are permitted only
  *      as authorized by the OpenLDAP Public License.  A copy of this
@@ -7,18 +13,20 @@
  *      in file LICENSE in the top-level directory of the distribution.
  */
 
+#include <EXTERN.h>
+#include <perl.h>
+#undef _ /* #defined by both Perl and ac/localize.h */
+
+#ifdef HAVE_WIN32_ASPERL
+#include "asperl_undefs.h"
+#endif
+
 #include "portable.h"
-/* init.c - initialize shell backend */
        
 #include <stdio.h>
-/*     #include <ac/types.h>
-       #include <ac/socket.h>
-*/
-
-#include <EXTERN.h>
-#include <perl.h>
 
 #include "slap.h"
+
 #include "perl_back.h"
 
 
@@ -30,7 +38,7 @@
 int
 perl_back_db_config(
         BackendDB *be,
-        char *fname,
+        const char *fname,
         int lineno,
         int argc,
         char **argv
@@ -52,21 +60,35 @@ perl_back_db_config(
                        return( 1 );
                }
 
-               strncpy(eval_str, argv[1], EVAL_BUF_SIZE );
+#ifdef PERL_IS_5_6
+               snprintf( eval_str, EVAL_BUF_SIZE, "use %s;", argv[1] );
+               eval_pv( eval_str, 0 );
 
-               perl_require_pv( strcat( eval_str, ".pm" ));
+               if (SvTRUE(ERRSV)) {
+                       STRLEN n_a;
+
+                       fprintf(stderr , "Error %s\n", SvPV(ERRSV, n_a)) ;
+               }
+#else
+               snprintf( eval_str, EVAL_BUF_SIZE, "%s.pm", argv[1] );
+               perl_require_pv( eval_str );
 
                if (SvTRUE(GvSV(errgv))) {
                        fprintf(stderr , "Error %s\n", SvPV(GvSV(errgv), na)) ;
-
-               } else {
+               }
+#endif /* PERL_IS_5_6 */
+               else {
                        dSP; ENTER; SAVETMPS;
                        PUSHMARK(sp);
                        XPUSHs(sv_2mortal(newSVpv(argv[1], 0)));
                        PUTBACK;
 
+#ifdef PERL_IS_5_6
+                       count = call_method("new", G_SCALAR);
+#else
                        count = perl_call_method("new", G_SCALAR);
-                       
+#endif
+
                        SPAGAIN;
 
                        if (count != 1) {
@@ -86,9 +108,17 @@ perl_back_db_config(
                        return( 1 );
                }
 
-               sprintf( eval_str, "push @INC, '%s';", argv[1] );
+               snprintf( eval_str, EVAL_BUF_SIZE, "push @INC, '%s';", argv[1] );
+#ifdef PERL_IS_5_6
+               loc_sv = eval_pv( eval_str, 0 );
+#else
                loc_sv = perl_eval_pv( eval_str, 0 );
+#endif
+
+               /* XXX loc_sv return value is ignored. */
 
+       } else if ( strcasecmp( argv[0], "filterSearchResults" ) == 0 ) {
+               perl_back->pb_filter_search_results = 1;
        } else {
                /*
                 * Pass it to Perl module if defined
@@ -107,7 +137,11 @@ perl_back_db_config(
 
                        PUTBACK ;
 
+#ifdef PERL_IS_5_6
+                       count = call_method("config", G_SCALAR);
+#else
                        count = perl_call_method("config", G_SCALAR);
+#endif
 
                        SPAGAIN ;
 
@@ -124,8 +158,8 @@ perl_back_db_config(
                /* if the module rejected it then we should reject it */
                if ( return_code != 0 ) {
                        fprintf( stderr,
-                                "Unknown perl backeng config: %s\n", argv[0]);
-                       exit( 1 );
+                                "Unknown perl backend config: %s\n", argv[0]);
+                       exit( EXIT_FAILURE );
                }
        }