X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FConfig.pm;h=87e61a2f54de7efabac7526b12fda83529065a79;hb=2ca3d4b399934b4ee936f9a3f511b22fbcd48281;hp=ae4c04fcc4ef6f09d51c967e091dca177ba0656f;hpb=ec76c573df68f75a957b358a7bdcb16d558f9635;p=debbugs.git diff --git a/Debbugs/Config.pm b/Debbugs/Config.pm index ae4c04f..87e61a2 100644 --- a/Debbugs/Config.pm +++ b/Debbugs/Config.pm @@ -103,13 +103,15 @@ use Safe; # untaint $ENV{DEBBUGS_CONFIG_FILE} if it's owned by us # This enables us to test things that are -T. if (exists $ENV{DEBBUGS_CONFIG_FILE}) { - if (${[stat($ENV{DEBBUGS_CONFIG_FILE})]}[4] = $<) { +# This causes all sorts of problems for mirrors of debbugs; disable +# it. +# if (${[stat($ENV{DEBBUGS_CONFIG_FILE})]}[4] == $<) { $ENV{DEBBUGS_CONFIG_FILE} =~ /(.+)/; $ENV{DEBBUGS_CONFIG_FILE} = $1; - } - else { - die "Environmental variable DEBBUGS_CONFIG_FILE set, and $ENV{DEBBUGS_CONFIG_FILE} is not owned by the user running this script."; - } +# } +# else { +# die "Environmental variable DEBBUGS_CONFIG_FILE set, and $ENV{DEBBUGS_CONFIG_FILE} is not owned by the user running this script."; +# } } read_config(exists $ENV{DEBBUGS_CONFIG_FILE}?$ENV{DEBBUGS_CONFIG_FILE}:'/etc/debbugs/config'); @@ -1025,7 +1027,7 @@ set_default(\%config,'html_expire_note', sub read_config{ my ($conf_file) = @_; if (not -e $conf_file) { - print STDERR "configuration file '$conf_file' doesn't exist; skipping it"; + print STDERR "configuration file '$conf_file' doesn't exist; skipping it\n" if $DEBUG; return; } # first, figure out what type of file we're reading in.