Merge remote branch 'origin/mdb.master'

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

diff --git a/servers/slapd/back-perl/config.c b/servers/slapd/back-perl/config.c
index a8b98a394337319b54735310144f1ca6abcab75f..dd8ff6475f3ea53ac334b8060d6a48f7f4264b12 100644 (file)
--- a/servers/slapd/back-perl/config.c
+++ b/servers/slapd/back-perl/config.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2011 The OpenLDAP Foundation.
+ * Copyright 1999-2012 The OpenLDAP Foundation.
  * Portions Copyright 1999 John C. Quillan.
  * Portions Copyright 2002 myinternet Limited.
  * All rights reserved.
@@ -173,13 +173,8 @@ perl_cf(
        } else {
                switch( c->type ) {
                case PERL_MODULE:
-#ifdef PERL_IS_5_6
                        snprintf( eval_str, EVAL_BUF_SIZE, "use %s;", c->argv[1] );
                        eval_pv( eval_str, 0 );
-#else
-                       snprintf( eval_str, EVAL_BUF_SIZE, "%s.pm", c->argv[1] );
-                       perl_require_pv( eval_str );
-#endif /* PERL_IS_5_6 */
 
                        if (SvTRUE(ERRSV)) {
                                STRLEN len;