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 f70d2b7ebba399de6c7909b0d0be729ed6598af8..63878e1d9b42b96720967dff6c46b21fac5d1e7d 100644 (file)
--- a/servers/slapd/back-perl/config.c
+++ b/servers/slapd/back-perl/config.c
@@ -1,7 +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 pty ltd. 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
@@ -9,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"
 
 
@@ -59,16 +65,19 @@ perl_back_db_config(
                eval_pv( eval_str, 0 );
 
                if (SvTRUE(ERRSV)) {
-                       fprintf(stderr , "Error %s\n", SvPV(ERRSV,  na)) ;
-#else
-               snprintf( eval_str, EVAL_BUF_SIZE, "%s", argv[1] );
+                       STRLEN n_a;
 
-               perl_require_pv( strcat( eval_str, ".pm" ));
+                       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)) ;
+               }
 #endif /* PERL_IS_5_6 */
-               } else {
+               else {
                        dSP; ENTER; SAVETMPS;
                        PUSHMARK(sp);
                        XPUSHs(sv_2mortal(newSVpv(argv[1], 0)));
@@ -106,6 +115,8 @@ perl_back_db_config(
                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 {