X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-perl%2Fconfig.c;h=c63135110da4b7cae093664dae3f2ba4e5c0406e;hb=e0952945d0b6da70703a711c91306be07d31ea1a;hp=f70d2b7ebba399de6c7909b0d0be729ed6598af8;hpb=7127e0887cfd03f096ecf335b36d78fdb49815cd;p=openldap

diff --git a/servers/slapd/back-perl/config.c b/servers/slapd/back-perl/config.c
index f70d2b7ebb..c63135110d 100644
--- a/servers/slapd/back-perl/config.c
+++ b/servers/slapd/back-perl/config.c
@@ -1,26 +1,20 @@
 /* $OpenLDAP$ */
-/*
- *	 Copyright 1999, John C. Quillan, All rights reserved.
- *	 Portions Copyright 2002, myinternet pty ltd. 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-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"
 
 
@@ -59,16 +53,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,9 +103,12 @@ 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 {
+		return_code = SLAP_CONF_UNKNOWN;
 		/*
 		 * Pass it to Perl module if defined
 		 */
@@ -144,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 backend config: %s\n", argv[0]);
-			exit( EXIT_FAILURE );
-		}
+		return return_code;
 	}
 
 	return 0;