Index: src/pl/plperl/plperl.c
===================================================================
RCS file: /home/cvsmirror/pgsql/src/pl/plperl/plperl.c,v
retrieving revision 1.54
diff -c -r1.54 plperl.c
*** src/pl/plperl/plperl.c	7 Oct 2004 19:01:09 -0000	1.54
--- src/pl/plperl/plperl.c	15 Oct 2004 14:48:18 -0000
***************
*** 250,266 ****
  
  	static char *safe_ok =
  	"use vars qw($PLContainer); $PLContainer = new Safe('PLPerl');"
! 	"$PLContainer->permit_only(':default');$PLContainer->permit(':base_math');"
! 	"$PLContainer->share(qw[&elog &spi_exec_query &DEBUG &LOG &INFO &NOTICE &WARNING &ERROR %SHARED ]);"
  	"sub ::mksafefunc { return $PLContainer->reval(qq[sub { $_[0] $_[1]}]); }"
  			   ;
  
  	static char *safe_bad =
  	"use vars qw($PLContainer); $PLContainer = new Safe('PLPerl');"
! 	"$PLContainer->permit_only(':default');$PLContainer->permit(':base_math');"
! 	"$PLContainer->share(qw[&elog &DEBUG &LOG &INFO &NOTICE &WARNING &ERROR %SHARED ]);"
  	"sub ::mksafefunc { return $PLContainer->reval(qq[sub { "
! 	"elog(ERROR,'trusted perl functions disabled - please upgrade perl Safe module to at least 2.09');}]); }"
  			   ;
  
  	SV		   *res;
--- 250,269 ----
  
  	static char *safe_ok =
  	"use vars qw($PLContainer); $PLContainer = new Safe('PLPerl');"
! 	"$PLContainer->permit_only(':default');"
! 	"$PLContainer->permit(qw[:base_math !:base_io !srand sort sprintf time]);"
! 	"$PLContainer->share(qw[&elog &spi_exec_query &DEBUG &LOG "
!     "&INFO &NOTICE &WARNING &ERROR %SHARED ]);"
  	"sub ::mksafefunc { return $PLContainer->reval(qq[sub { $_[0] $_[1]}]); }"
  			   ;
  
  	static char *safe_bad =
  	"use vars qw($PLContainer); $PLContainer = new Safe('PLPerl');"
! 	"$PLContainer->permit_only(':default');"
! 	"$PLContainer->share(qw[&elog &ERROR ]);"
  	"sub ::mksafefunc { return $PLContainer->reval(qq[sub { "
! 	"elog(ERROR,'trusted perl functions disabled - "
!     "please upgrade perl Safe module to at least 2.09');}]); }"
  			   ;
  
  	SV		   *res;