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 e10cb05bf6c4a975fb324ac744f2dfe116c0c077..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"
 
 
@@ -52,21 +48,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 );
+
+               if (SvTRUE(ERRSV)) {
+                       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)) ;
-
-               } 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,10 +96,19 @@ 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
                 */
@@ -107,7 +126,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 ;
 
@@ -121,12 +144,7 @@ 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( EXIT_FAILURE );
-               }
+               return return_code;
        }
 
        return 0;