diff options
| author | fukachan <fukachan> | 2003-02-01 13:45:58 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2003-02-01 13:45:58 +0000 |
| commit | 8493708a52f55c8738edd77eb9eb9d0497d0b74c (patch) | |
| tree | b1741a1e2e18775a432267489803c73abce33ac5 /fml/lib/FML/Command/Admin/chaddr.pm | |
| parent | f6dfceee3619c991b91f57a03e935b2debb63c34 (diff) | |
| download | fml8-8493708a52f55c8738edd77eb9eb9d0497d0b74c.tar.gz fml8-8493708a52f55c8738edd77eb9eb9d0497d0b74c.tar.bz2 fml8-8493708a52f55c8738edd77eb9eb9d0497d0b74c.zip | |
remove address matched by IO::Adapter in the case of $old_address
Diffstat (limited to 'fml/lib/FML/Command/Admin/chaddr.pm')
| -rw-r--r-- | fml/lib/FML/Command/Admin/chaddr.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fml/lib/FML/Command/Admin/chaddr.pm b/fml/lib/FML/Command/Admin/chaddr.pm index ee22a2c9..01d120af 100644 --- a/fml/lib/FML/Command/Admin/chaddr.pm +++ b/fml/lib/FML/Command/Admin/chaddr.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: chaddr.pm,v 1.10 2003/02/01 05:27:52 fukachan Exp $ +# $FML: chaddr.pm,v 1.11 2003/02/01 06:08:39 fukachan Exp $ # package FML::Command::Admin::chaddr; @@ -104,6 +104,8 @@ sub process # the current member/recipient file must have $old_address # but should not contain $new_address. if ($cred->has_address_in_map($map, $config, $old_address)) { + my $old_address_in_map = $cred->matched_address(); + unless ($cred->has_address_in_map($map, $config, $new_address)) { # remove the old address only if $new_address not included. { @@ -111,7 +113,7 @@ sub process $obj->touch(); $obj->open(); - $obj->delete( $old_address ); + $obj->delete( $old_address_in_map ); unless ($obj->error()) { Log("delete $old_address from map=$map"); } |