[interchange-cvs] interchange - racke modified lib/Vend/Util.pm

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Thu Mar 20 18:32:01 2003


User:      racke
Date:      2003-03-20 23:31:24 GMT
Modified:  lib/Vend Util.pm
Log:
removed usage of $Vend::Cfg->{ExtraSecure} which contradicts documentation

Revision  Changes    Path
2.54      +3 -6      interchange/lib/Vend/Util.pm


rev 2.54, prev_rev 2.53
Index: Util.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Util.pm,v
retrieving revision 2.53
retrieving revision 2.54
diff -u -r2.53 -r2.54
--- Util.pm	6 Mar 2003 17:12:41 -0000	2.53
+++ Util.pm	20 Mar 2003 23:31:24 -0000	2.54
@@ -1,6 +1,6 @@
 # Vend::Util - Interchange utility functions
 #
-# $Id: Util.pm,v 2.53 2003/03/06 17:12:41 racke Exp $
+# $Id: Util.pm,v 2.54 2003/03/20 23:31:24 racke Exp $
 # 
 # Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -85,7 +85,7 @@
 use Safe;
 use subs qw(logError logGlobal);
 use vars qw($VERSION @EXPORT @EXPORT_OK);
-$VERSION = substr(q$Revision: 2.53 $, 10);
+$VERSION = substr(q$Revision: 2.54 $, 10);
 
 my $Eval_routine;
 my $Eval_routine_file;
@@ -855,11 +855,8 @@
 
 sub string_to_ref {
 	my ($string) = @_;
-	if(! $Vend::Cfg->{ExtraSecure} and $MVSAFE::Safe) {
+	if($MVSAFE::Safe) {
 		return eval $string;
-	}
-	elsif ($MVSAFE::Safe) {
-		die errmsg("not allowed to eval in Safe mode.");
 	}
 	my $safe = $Vend::Interpolate::safe_safe || new Safe;
 	return $safe->reval($string);