diff options
| author | Peter Palfrader <peter@palfrader.org> | 2002-07-06 18:34:01 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2002-07-06 18:34:01 +0000 |
| commit | 7d86e005ea1b47350d317922289f42341fe5445d (patch) | |
| tree | d7c919caba0bd81b8daaf05283f6cb98c52ebcf2 /Echolot/Conf.pm | |
| parent | 34a1890bf75ecd202e1cb3cd06d67368458fa222 (diff) | |
Parse mixmaster caps lines without capabilities correctly now (lcs)
Diffstat (limited to 'Echolot/Conf.pm')
| -rw-r--r-- | Echolot/Conf.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Echolot/Conf.pm b/Echolot/Conf.pm index 73dedda..34b381e 100644 --- a/Echolot/Conf.pm +++ b/Echolot/Conf.pm @@ -1,7 +1,7 @@ package Echolot::Conf; # (c) 2002 Peter Palfrader <peter@palfrader.org> -# $Id: Conf.pm,v 1.12 2002/07/06 00:50:27 weasel Exp $ +# $Id: Conf.pm,v 1.13 2002/07/06 18:34:01 weasel Exp $ # =pod @@ -202,14 +202,14 @@ sub parse_mix_key($$$) { my %mixmasters; # rot26 rot26@mix.uucico.de 7f6d997678b19ccac110f6e669143126 2.9b33 MC - my @mix_confs = ($reply =~ /^[a-z0-9]+ \s+ \S+\@\S+ \s+ [0-9a-f]{32} (?:\s+ \S+ \s+ \S+)?/xmg); + my @mix_confs = ($reply =~ /^[a-z0-9]+ \s+ \S+\@\S+ \s+ [0-9a-f]{32} (?:\s+ \S+ (?:[ \t]+ \S+)?)?/xmg); my @mix_keys = ($reply =~ /^-----Begin \s Mix \s Key-----\r?\n [0-9a-f]{32}\r?\n \d+\r?\n (?:[a-zA-Z0-9+\/]*\r?\n)+ -----End \s Mix \s Key-----$/xmg ); for (@mix_confs) { - my ($nick, $address, $keyid, $version, $caps) = /^([a-z0-9]+) \s+ (\S+@\S+) \s+ ([0-9a-f]{32}) (?:(\S+) \s+ (\S+))?/x; + my ($nick, $address, $keyid, $version, $caps) = /^([a-z0-9]+) \s+ (\S+@\S+) \s+ ([0-9a-f]{32}) (?:(\S+) (?:[\t]+ (\S+)))?/x; $mixmasters{$keyid} = { nick => $nick, address => $address, |