From 62c859444ceb4401f6e73c48f4d6035f26646830 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 6 Jun 2003 09:56:03 +0000 Subject: backed out: Accept lack of double quotes in caps lines --- Echolot/Conf.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Echolot/Conf.pm') diff --git a/Echolot/Conf.pm b/Echolot/Conf.pm index 71ea3d5..0c3eb50 100644 --- a/Echolot/Conf.pm +++ b/Echolot/Conf.pm @@ -1,7 +1,7 @@ package Echolot::Conf; # (c) 2002 Peter Palfrader -# $Id: Conf.pm,v 1.40 2003/06/06 09:50:55 weasel Exp $ +# $Id: Conf.pm,v 1.41 2003/06/06 09:56:03 weasel Exp $ # =pod @@ -121,9 +121,9 @@ sub remailer_caps($$$;$) { Echolot::Log::info("Could not find id in token '$token'."), return 0 unless defined $id; my ($remailer_type) = ($conf =~ /^\s*Remailer-Type:\s* (.*?) \s*$/imx); Echolot::Log::info("No remailer type found in remailer_caps from '$token'."), return 0 unless defined $remailer_type; - my ($remailer_caps) = ($conf =~ /^\s*( \$remailer{"?.*"?} \s*=\s* "?<.*@.*>.*"?; )\s*$/imx); + my ($remailer_caps) = ($conf =~ /^\s*( \$remailer{".*"} \s*=\s* "<.*@.*>.*"; )\s*$/imx); Echolot::Log::info("No remailer caps found in remailer_caps from '$token'."), return 0 unless defined $remailer_caps; - my ($remailer_nick, $remailer_address) = ($remailer_caps =~ /^\s* \$remailer{"?(.*)"?} \s*=\s* "?<(.*@.*)>.*"?; \s*$/ix); + my ($remailer_nick, $remailer_address) = ($remailer_caps =~ /^\s* \$remailer{"(.*)"} \s*=\s* "<(.*@.*)>.*"; \s*$/ix); Echolot::Log::info("No remailer nick found in remailer_caps from '$token': '$remailer_caps'."), return 0 unless defined $remailer_nick; Echolot::Log::info("No remailer address found in remailer_caps from '$token': '$remailer_caps'."), return 0 unless defined $remailer_address; -- cgit v1.2.3