Warning cleanup: signed meets unsigned.

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

diff --git a/servers/slapd/back-perl/config.c b/servers/slapd/back-perl/config.c
index c2e4298e676f1c1f4857aaab36911da6a49ae671..c63135110da4b7cae093664dae3f2ba4e5c0406e 100644 (file)
--- a/servers/slapd/back-perl/config.c
+++ b/servers/slapd/back-perl/config.c
@@ -1,24 +1,20 @@
-/*
- *      Copyright 1999, John C. Quillan, All rights reserved.
+/* $OpenLDAP$ */
+/* 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-2008 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 <ac/types.h>
-       #include <ac/socket.h>
-*/
-
-#include <EXTERN.h>
-#include <perl.h>
-
-#include "slap.h"
 #include "perl_back.h"
 
 
@@ -30,7 +26,7 @@
 int
 perl_back_db_config(
         BackendDB *be,
-        char *fname,
+        const char *fname,
         int lineno,
         int argc,
         char **argv
@@ -40,8 +36,9 @@ perl_back_db_config(
        PerlBackend *perl_back = (PerlBackend *) be->be_private;
        char eval_str[EVAL_BUF_SIZE];
        int count ;
-
-       /***** SECURITY PROBLEM HERE FIX LATER *****/
+       int args;
+       int return_code;
+       
 
        if ( strcasecmp( argv[0], "perlModule" ) == 0 ) {
                if ( argc < 2 ) {
@@ -51,20 +48,34 @@ 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;
 
@@ -85,17 +96,55 @@ 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 {
+               return_code = SLAP_CONF_UNKNOWN;
                /*
                 * Pass it to Perl module if defined
                 */
 
-               fprintf( stderr,
-                       "Unknown perl backend config: %s\n", argv[0]);
-               return( 1 );
+               {
+                       dSP ;  ENTER ; SAVETMPS;
+
+                       PUSHMARK(sp) ;
+                       XPUSHs( perl_back->pb_obj_ref );
+
+                       /* Put all arguments on the perl stack */
+                       for( args = 0; args < argc; args++ ) {
+                               XPUSHs(sv_2mortal(newSVpv(argv[args], 0)));
+                       }
+
+                       PUTBACK ;
+
+#ifdef PERL_IS_5_6
+                       count = call_method("config", G_SCALAR);
+#else
+                       count = perl_call_method("config", G_SCALAR);
+#endif
+
+                       SPAGAIN ;
+
+                       if (count != 1) {
+                               croak("Big trouble in config\n") ;
+                       }
+
+                       return_code = POPi;
+
+                       PUTBACK ; FREETMPS ;  LEAVE ;
+
+               }
+
+               return return_code;
        }
 
        return 0;