From 0a3252d88d148a8cb21774cd3ae6a1cb1fbb004c Mon Sep 17 00:00:00 2001 From: awiddersheim Date: Tue, 22 Oct 2013 10:33:56 -0400 Subject: Fix trusted path When configuring the plugins you have the option to specify a trusted path with --with-trusted-path. This option seems to have been deprecated at some point for unknown reasons and had typically had no affect. This commit makes this option work again for those who have a desire to use it. There should be no affect on those who have not chosen to specify a trusted path. --- plugins-scripts/subst.in | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'plugins-scripts/subst.in') diff --git a/plugins-scripts/subst.in b/plugins-scripts/subst.in index a70ad884..49a95ca1 100644 --- a/plugins-scripts/subst.in +++ b/plugins-scripts/subst.in @@ -61,18 +61,9 @@ BEGIN { # add to libexecdir to INC for perl utils.pm /^use/ { if (/lib/) { if (/utils.pm|"."/ ) {sub(/utils.pm|"."/,led() )} } } - -# Trusted path mechanism (deprecated) - -/^[ \t]*\$ENV[ \t]*\{[ \t'"]*PATH[ \t"']*\}[ \t]*=/ { - sub(/\=[ \t]*['"][^"']+["']/,"='@with_trusted_path@' # autoconf-derived"); -} - -/^[\t ]*(export[\t ]*)?PATH[\t ]*=['"]+.+["']$/ { - sub(/\=.*$/,"='@with_trusted_path@' # autoconf-derived"); -} +# Trusted path mechanism +/@trusted_path@/ {sub(/@trusted_path@/,"@with_trusted_path@");} { print; } - -- cgit v1.2.3-74-g34f1