diff options
| author | fukachan <fukachan> | 2003-11-26 04:47:08 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2003-11-26 04:47:08 +0000 |
| commit | 65eb79e42995b13c59a269d474c206daa4ce045d (patch) | |
| tree | f6665a73af5ba4e91635297d0699c1180d4eca7b | |
| parent | d50520009de496c662e6d35db46d7fe825ad0fd4 (diff) | |
| download | fml8-65eb79e42995b13c59a269d474c206daa4ce045d.tar.gz fml8-65eb79e42995b13c59a269d474c206daa4ce045d.tar.bz2 fml8-65eb79e42995b13c59a269d474c206daa4ce045d.zip | |
address_compare -> address_compare_function
| -rw-r--r-- | fml/etc/src/config.cf.ja/acl.cf | 4 | ||||
| -rw-r--r-- | fml/lib/FML/Credential.pm | 25 |
2 files changed, 15 insertions, 14 deletions
diff --git a/fml/etc/src/config.cf.ja/acl.cf b/fml/etc/src/config.cf.ja/acl.cf index 273391c4..7a0c19c8 100644 --- a/fml/etc/src/config.cf.ja/acl.cf +++ b/fml/etc/src/config.cf.ja/acl.cf @@ -7,7 +7,7 @@ # History: 当然するので、off/on スイッチなぞない # Value: yes | no # Examples: yes -use_address_compare = yes +use_address_compare_function = yes # Descriptions: メンバーチェックをする際に、ユーザパートの比較で @@ -16,7 +16,7 @@ use_address_compare = yes # History: none # Value: user_part_case_sensitive | user_part_case_insensitive # Examples: user_part_case_insensitive -address_compare_type = user_part_case_insensitive +address_compare_function_type = user_part_case_insensitive =head2 各機能における制限( ***_restrictions ) diff --git a/fml/lib/FML/Credential.pm b/fml/lib/FML/Credential.pm index 2b09a0f1..dd0c4aad 100644 --- a/fml/lib/FML/Credential.pm +++ b/fml/lib/FML/Credential.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: Credential.pm,v 1.48 2003/11/17 15:38:16 fukachan Exp $ +# $FML: Credential.pm,v 1.49 2003/11/25 14:50:11 fukachan Exp $ # package FML::Credential; @@ -62,29 +62,30 @@ sub new my ($self, $curproc) = @_; my ($type) = ref($self) || $self; my $config = $curproc->config(); + my $type = $config->{ address_compare_function_type }; my $me = \%Credential; # default comparison level set_compare_level( $me, 3 ); # user address check - if ($config->yes('use_address_compare')) { - $me->{ _use_address_compare } = 1; + if ($config->yes('use_address_compare_function')) { + $me->{ _use_address_compare_function } = 1; } else { - $me->{ _use_address_compare } = 0; + $me->{ _use_address_compare_function } = 0; } + # case insensitive for backward compatibility. (default) + if ($type eq 'user_part_case_insensitive' || + $type eq 'case_insensitive') { + $me->{ _user_part_case_sensitive } = 0; + } # case sensitive for user part comparison. - if ($config->{ address_compare_type } eq 'user_part_case_sensitive' || - $config->{ address_compare_type } eq 'case_sensitive') { + elsif ($type eq 'user_part_case_sensitive' || + $type eq 'case_sensitive') { $me->{ _user_part_case_sensitive } = 1; } - # for backward compatibility. - elsif ($config->{ address_compare_type } eq 'user_part_case_insensitive' || - $config->{ address_compare_type } eq 'case_insensitive') { - $me->{ _user_part_case_sensitive } = 0; - } # case-insensitive by default for backward compatibility. else { $me->{ _user_part_case_sensitive } = 0; @@ -193,7 +194,7 @@ sub is_same_address my ($self, $xaddr, $yaddr, $max_level) = @_; # always same if address_check function disabled. - unless ($self->{ _use_address_compare }) { return 1; } + unless ($self->{ _use_address_compare_function }) { return 1; } # both should be defined ! unless (defined($xaddr) && defined($yaddr)) { |