summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfukachan <fukachan>2003-02-01 05:27:51 +0000
committerfukachan <fukachan>2003-02-01 05:27:51 +0000
commite43d869538b0c6e4c2e844321ff33fac32c7b751 (patch)
tree9ec96184aef253ad5412b53b66402e1ab6a204f7
parentfe2c36d41ad887eb8522aca7939d4b0bf3356fa3 (diff)
downloadfml8-e43d869538b0c6e4c2e844321ff33fac32c7b751.tar.gz
fml8-e43d869538b0c6e4c2e844321ff33fac32c7b751.tar.bz2
fml8-e43d869538b0c6e4c2e844321ff33fac32c7b751.zip
try exact matching just before changing user.
-rw-r--r--fml/lib/FML/Command/Admin/chaddr.pm5
-rw-r--r--fml/lib/FML/Command/User/chaddr.pm5
-rw-r--r--fml/lib/FML/Command/User/subscribe.pm5
-rw-r--r--fml/lib/FML/Command/User/unsubscribe.pm5
-rw-r--r--fml/lib/FML/Command/UserControl.pm10
5 files changed, 25 insertions, 5 deletions
diff --git a/fml/lib/FML/Command/Admin/chaddr.pm b/fml/lib/FML/Command/Admin/chaddr.pm
index 3f96029d..0c379c98 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.8 2002/09/22 14:56:44 fukachan Exp $
+# $FML: chaddr.pm,v 1.9 2002/12/20 03:40:11 fukachan Exp $
#
package FML::Command::Admin::chaddr;
@@ -95,6 +95,9 @@ sub process
push(@maps, @$recipient_maps);
for my $map (@maps) {
my $cred = new FML::Credential $curproc;
+
+ # exatct match as could as possible.
+ $cred->set_compare_level( 100 );
# XXX-TODO: this condition is correct ?
# XXX-TODO: we should remove old one when both old and new ones exist.
diff --git a/fml/lib/FML/Command/User/chaddr.pm b/fml/lib/FML/Command/User/chaddr.pm
index 958c777d..fb20c2ed 100644
--- a/fml/lib/FML/Command/User/chaddr.pm
+++ b/fml/lib/FML/Command/User/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.15 2002/12/18 04:22:36 fukachan Exp $
+# $FML: chaddr.pm,v 1.16 2002/12/24 10:19:45 fukachan Exp $
#
package FML::Command::User::chaddr;
@@ -86,6 +86,9 @@ sub process
use FML::Credential;
my $cred = new FML::Credential $curproc;
+ # exatct match as could as possible.
+ $cred->set_compare_level( 100 );
+
# addresses we check and send back confirmation messages to
my $optargs = {};
my $x = $command_args->{ command };
diff --git a/fml/lib/FML/Command/User/subscribe.pm b/fml/lib/FML/Command/User/subscribe.pm
index 7f17ff36..a00fadc2 100644
--- a/fml/lib/FML/Command/User/subscribe.pm
+++ b/fml/lib/FML/Command/User/subscribe.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: subscribe.pm,v 1.15 2002/09/22 14:56:48 fukachan Exp $
+# $FML: subscribe.pm,v 1.16 2002/12/18 04:22:37 fukachan Exp $
#
package FML::Command::User::subscribe;
@@ -80,6 +80,9 @@ sub process
use FML::Credential;
my $cred = new FML::Credential $curproc;
+ # exatct match as could as possible.
+ $cred->set_compare_level( 100 );
+
# if already member, subscriber request is wrong.
if ($cred->is_member($address)) {
$curproc->reply_message_nl('error.already_member',
diff --git a/fml/lib/FML/Command/User/unsubscribe.pm b/fml/lib/FML/Command/User/unsubscribe.pm
index e3f0e195..268284c1 100644
--- a/fml/lib/FML/Command/User/unsubscribe.pm
+++ b/fml/lib/FML/Command/User/unsubscribe.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: unsubscribe.pm,v 1.15 2002/09/22 14:56:48 fukachan Exp $
+# $FML: unsubscribe.pm,v 1.16 2002/12/18 04:22:37 fukachan Exp $
#
package FML::Command::User::unsubscribe;
@@ -80,6 +80,9 @@ sub process
use FML::Credential;
my $cred = new FML::Credential $curproc;
+ # exatct match as could as possible.
+ $cred->set_compare_level( 100 );
+
# if not member, unsubscriber request is wrong.
unless ($cred->is_member($address)) {
$curproc->reply_message_nl('error.not_member');
diff --git a/fml/lib/FML/Command/UserControl.pm b/fml/lib/FML/Command/UserControl.pm
index 8f421707..d9b15199 100644
--- a/fml/lib/FML/Command/UserControl.pm
+++ b/fml/lib/FML/Command/UserControl.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: UserControl.pm,v 1.21 2003/01/07 11:42:23 fukachan Exp $
+# $FML: UserControl.pm,v 1.22 2003/01/09 10:41:14 fukachan Exp $
#
package FML::Command::UserControl;
@@ -75,6 +75,10 @@ sub useradd
$_map =~ s/file://;
my $cred = new FML::Credential $curproc;
+
+ # exatct match as could as possible.
+ $cred->set_compare_level( 100 );
+
unless ($cred->has_address_in_map($map, $config, $address)) {
$msg_args->{ _arg_map } = $curproc->which_map_nl($map);
@@ -134,6 +138,10 @@ sub userdel
$_map =~ s/file://;
my $cred = new FML::Credential $curproc;
+
+ # exatct match as could as possible.
+ $cred->set_compare_level( 100 );
+
if ($cred->has_address_in_map($map, $config, $address)) {
$msg_args->{ _arg_map } = $curproc->which_map_nl($map);