diff options
| author | fukachan <fukachan> | 2006-07-09 12:11:11 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2006-07-09 12:11:11 +0000 |
| commit | b6576c5f6a85a07323f4d84c329174d2309931c4 (patch) | |
| tree | 223f4b9697babf9b10d12aef8a6a9406e325371d /fml/lib/FML | |
| parent | 800f03b305f15bbc7fcc5fb99b2cbd51096e4e99 (diff) | |
| download | fml8-b6576c5f6a85a07323f4d84c329174d2309931c4.tar.gz fml8-b6576c5f6a85a07323f4d84c329174d2309931c4.tar.bz2 fml8-b6576c5f6a85a07323f4d84c329174d2309931c4.zip | |
white space cosmetics
Diffstat (limited to 'fml/lib/FML')
27 files changed, 513 insertions, 513 deletions
diff --git a/fml/lib/FML/Body.pm b/fml/lib/FML/Body.pm index 7b980a49..b2115baa 100644 --- a/fml/lib/FML/Body.pm +++ b/fml/lib/FML/Body.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: Body.pm,v 1.3 2006/05/13 11:45:40 fukachan Exp $ +# $FML: Body.pm,v 1.4 2006/05/13 11:50:31 fukachan Exp $ # package FML::Body; @@ -139,7 +139,7 @@ set checksum method type. =head2 get_checksum_type() -get checksum method type. +get checksum method type. return 'md5' by default. =cut diff --git a/fml/lib/FML/Command/Admin/log.pm b/fml/lib/FML/Command/Admin/log.pm index 265890a7..72e560f3 100644 --- a/fml/lib/FML/Command/Admin/log.pm +++ b/fml/lib/FML/Command/Admin/log.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: log.pm,v 1.31 2006/02/22 12:05:59 fukachan Exp $ +# $FML: log.pm,v 1.32 2006/03/04 13:48:28 fukachan Exp $ # package FML::Command::Admin::log; @@ -113,7 +113,7 @@ sub _show_log # Descriptions: grep log file by date. -# Arguments: OBJ($self) +# Arguments: OBJ($self) # OBJ($curproc) STR($log_file) HASH_REF($sl_args) NUM($when) # Side Effects: none # Return Value: none @@ -178,7 +178,7 @@ sub _show_log_tail my $is_cgi = 1 if $sl_args->{ printing_style } eq 'html'; my $line_count = 0; my $line_max = 0; - my $charset = + my $charset = $curproc->langinfo_get_charset($is_cgi ? "cgi" : "log_file"); # run "tail -100 log" by default. diff --git a/fml/lib/FML/Command/Admin/subscribe.pm b/fml/lib/FML/Command/Admin/subscribe.pm index a0a8a5d4..482fba48 100644 --- a/fml/lib/FML/Command/Admin/subscribe.pm +++ b/fml/lib/FML/Command/Admin/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.38 2006/05/16 14:36:30 fukachan Exp $ +# $FML: subscribe.pm,v 1.39 2006/05/17 12:31:42 fukachan Exp $ # package FML::Command::Admin::subscribe; @@ -189,7 +189,7 @@ sub _is_member_total_exceed_limit } -# Descriptions: check the number of users in ${map_name}_maps +# Descriptions: check the number of users in ${map_name}_maps # exceeds the limit or not. # Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) STR($map_name) # Side Effects: none @@ -203,7 +203,7 @@ sub _check_total_limit my $control = new FML::User::Control; my $var_maps = sprintf("%s_maps", $map_name); my $config = $curproc->config(); - my $maplist = $config->get_as_array_ref($var_maps); + my $maplist = $config->get_as_array_ref($var_maps); my $user_total = $control->get_user_total($curproc, $maplist); # 2. compare. return 1 if the total exceeds the limit. diff --git a/fml/lib/FML/Command/QmailExt.pm b/fml/lib/FML/Command/QmailExt.pm index b1b42290..5d520650 100644 --- a/fml/lib/FML/Command/QmailExt.pm +++ b/fml/lib/FML/Command/QmailExt.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: @template.pm,v 1.10 2006/01/07 13:16:41 fukachan Exp $ +# $FML: QmailExt.pm,v 1.1 2006/05/09 12:43:58 fukachan Exp $ # package FML::Command::QmailExt; @@ -115,7 +115,7 @@ sub _parse_extension $found = 1; last COMMAND; } - } + } if ($found) { return($found, \@command); @@ -238,7 +238,7 @@ sub _reopen_stdio_channel close(STDIN); my $status = open(STDIN, $message_file); - return( $status ? 1 : 0 ); + return( $status ? 1 : 0 ); } diff --git a/fml/lib/FML/Command/User/get.pm b/fml/lib/FML/Command/User/get.pm index 7490b517..99a6ea79 100644 --- a/fml/lib/FML/Command/User/get.pm +++ b/fml/lib/FML/Command/User/get.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: get.pm,v 1.25 2006/03/04 13:48:29 fukachan Exp $ +# $FML: get.pm,v 1.26 2006/04/16 06:33:36 fukachan Exp $ # package FML::Command::User::get; @@ -71,7 +71,7 @@ sub check_limit # 1. check the number of article in one command. my $total = $pcb->get('command', 'get_command_request_total') || 0; - my $nreq = $self->num_files_in_send_article_args($curproc, + my $nreq = $self->num_files_in_send_article_args($curproc, $command_context); my $request_total = $total + $nreq; $pcb->set('command', 'get_command_request_total', $request_total); diff --git a/fml/lib/FML/Config.pm b/fml/lib/FML/Config.pm index 2e356612..1a36109d 100644 --- a/fml/lib/FML/Config.pm +++ b/fml/lib/FML/Config.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: Config.pm,v 1.104 2006/02/03 11:06:03 fukachan Exp $ +# $FML: Config.pm,v 1.105 2006/05/02 11:22:43 fukachan Exp $ # package FML::Config; @@ -1239,13 +1239,13 @@ sub set_context $current_context = $context; unless (defined $_fml_pool->{ $current_context }->{ _fml_config_result }) { - my $p = $_fml_pool; + my $p = $_fml_pool; $p->{ $current_context }->{ _fml_config_result } = {}; $p->{ $current_context }->{ _fml_config } = {}; $p->{ $current_context }->{ _default_fml_config } = {}; } - my $p = $_fml_pool; + my $p = $_fml_pool; $_fml_config_result = $p->{ $current_context }->{ _fml_config_result }; $_fml_config = $p->{ $current_context }->{ _fml_config }; $_default_fml_config = $p->{ $current_context }->{ _default_fml_config }; diff --git a/fml/lib/FML/CreateOnPost.pm b/fml/lib/FML/CreateOnPost.pm index b8b136b4..a8e41c1f 100644 --- a/fml/lib/FML/CreateOnPost.pm +++ b/fml/lib/FML/CreateOnPost.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: @template.pm,v 1.10 2006/01/07 13:16:41 fukachan Exp $ +# $FML: CreateOnPost.pm,v 1.1 2006/02/04 08:00:09 fukachan Exp $ # package FML::CreateOnPost; @@ -41,7 +41,7 @@ sub new } -# Descriptions: create ml. +# Descriptions: create ml. # Arguments: OBJ($self) STR($ml_addr) # Side Effects: none # Return Value: none diff --git a/fml/lib/FML/Demo/Calendar.pm b/fml/lib/FML/Demo/Calendar.pm index 04e36922..b71a5934 100644 --- a/fml/lib/FML/Demo/Calendar.pm +++ b/fml/lib/FML/Demo/Calendar.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: Calendar.pm,v 1.2 2005/05/27 00:53:23 fukachan Exp $ +# $FML: Calendar.pm,v 1.3 2006/01/12 12:17:26 fukachan Exp $ # package FML::Demo::Calendar; @@ -56,7 +56,7 @@ files here and use only valid entries found in them. The file format follows: # comment: the format is /^(\d+\/\d+)\s+(.*)/ or /^(*\/\d+)\s+(.*)/ - DATE CONTENT + DATE CONTENT DATE CONTENT FORMAT IS ARBITORARY where null lines or space lines are ignored. diff --git a/fml/lib/FML/Demo/Chart.pm b/fml/lib/FML/Demo/Chart.pm index 6f7fbc07..581017be 100644 --- a/fml/lib/FML/Demo/Chart.pm +++ b/fml/lib/FML/Demo/Chart.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$ +# $FML: Chart.pm,v 1.1 2006/02/01 12:35:45 fukachan Exp $ # package FML::Demo::Chart; @@ -312,7 +312,7 @@ sub print_as_html_table } } print "\n"; - } + } print "</TABLE>\n"; } @@ -350,7 +350,7 @@ sub print_as_csv print ","; } print "\n"; - } + } } diff --git a/fml/lib/FML/Demo/Project.pm b/fml/lib/FML/Demo/Project.pm index d1b5c20e..a145183a 100644 --- a/fml/lib/FML/Demo/Project.pm +++ b/fml/lib/FML/Demo/Project.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: @template.pm,v 1.10 2006/01/07 13:16:41 fukachan Exp $ +# $FML: Project.pm,v 1.1 2006/02/01 12:35:45 fukachan Exp $ # package FML::Demo::Project; @@ -81,7 +81,7 @@ sub parse my ($title, @_data) = split(/\s+/, $buf); DATA: for my $s (@_data) { - if ($s =~ /\d+\/\d+/ || $s =~ /\d+\/\d+\/\d+/) { + if ($s =~ /\d+\/\d+/ || $s =~ /\d+\/\d+\/\d+/) { $date = $self->_canonical_date($s); next DATA; } @@ -190,15 +190,15 @@ sub build my $chart = new FML::Demo::Chart; my $max_line = $#$data; for (my $line = 1; $line < $max_line; $line++) { - my $level = $data->[ $line ]->{ level } || 1; - my $title = $data->[ $line ]->{ title } || ''; - my $date = $data->[ $line ]->{ date } || ''; - my $comment = $data->[ $line ]->{ comment } || ''; + my $level = $data->[ $line ]->{ level } || 1; + my $title = $data->[ $line ]->{ title } || ''; + my $date = $data->[ $line ]->{ date } || ''; + my $comment = $data->[ $line ]->{ comment } || ''; - if ($level == 1) { + if ($level == 1) { $chart->add($line, "item1", $title); } - elsif ($level == 2) { + elsif ($level == 2) { $chart->add($line, "item2", $title); } else { @@ -224,7 +224,7 @@ sub build # Return Value: none sub print_as_html_table { - my ($self) = @_; + my ($self) = @_; my $chart = $self->{ _chart }; $chart->print_as_html_table(); } @@ -236,7 +236,7 @@ sub print_as_html_table # Return Value: none sub print_as_csv { - my ($self) = @_; + my ($self) = @_; my $chart = $self->{ _chart }; $chart->print_as_csv(); } diff --git a/fml/lib/FML/Envelope.pm b/fml/lib/FML/Envelope.pm index b8704d44..4d8e02d7 100644 --- a/fml/lib/FML/Envelope.pm +++ b/fml/lib/FML/Envelope.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: @template.pm,v 1.10 2006/01/07 13:16:41 fukachan Exp $ +# $FML: Envelope.pm,v 1.1 2006/05/14 11:25:13 fukachan Exp $ # package FML::Envelope; @@ -85,7 +85,7 @@ set checksum method type. =head2 get_checksum_type() -get checksum method type. +get checksum method type. return 'md5' by default. =cut diff --git a/fml/lib/FML/File/Rotate.pm b/fml/lib/FML/File/Rotate.pm index 755df468..06fbb6c6 100644 --- a/fml/lib/FML/File/Rotate.pm +++ b/fml/lib/FML/File/Rotate.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: Rotate.pm,v 1.6 2005/05/27 03:03:35 fukachan Exp $ +# $FML: Rotate.pm,v 1.7 2006/04/22 08:29:23 fukachan Exp $ # package FML::File::Rotate; @@ -182,7 +182,7 @@ sub is_time_to_rotate } } } - + return 0; } diff --git a/fml/lib/FML/Header.pm b/fml/lib/FML/Header.pm index 8e232a22..7f1808c7 100644 --- a/fml/lib/FML/Header.pm +++ b/fml/lib/FML/Header.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: Header.pm,v 1.91 2006/03/18 02:28:33 fukachan Exp $ +# $FML: Header.pm,v 1.92 2006/04/17 12:00:50 fukachan Exp $ # package FML::Header; @@ -351,7 +351,7 @@ sub add_rfc2369 my $ml_name = $config->{ ml_name } || ''; my $ml_domain = $config->{ ml_domain } || ''; my $post = $config->{ article_post_address } || ''; - my $_contact = "contact maintainer <$maintainer>"; + my $_contact = "contact maintainer <$maintainer>"; my $default = $maintainer ? $_contact : 'unavailable'; my $list_id = $_list_id || "$ml_name ML <$ml_name.$ml_domain>"; my $list_owner = $maintainer ? $_list_owner : 'maintainer'; diff --git a/fml/lib/FML/Log.pm b/fml/lib/FML/Log.pm index ed34b12d..ec217f28 100644 --- a/fml/lib/FML/Log.pm +++ b/fml/lib/FML/Log.pm @@ -2,7 +2,7 @@ # # Copyright (C) 2000,2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi # -# $FML: Log.pm,v 1.34 2006/04/02 06:34:48 fukachan Exp $ +# $FML: Log.pm,v 1.35 2006/05/04 05:25:40 fukachan Exp $ # package FML::Log; @@ -139,7 +139,7 @@ sub Log my $fh = undef; my $sender = FML::Credential->sender; - # expand % in log file name by POSIX::strftime(). + # expand % in log file name by POSIX::strftime(). if ($file =~ /\%/o) { $file = strftime($file, localtime); } diff --git a/fml/lib/FML/ML/Control.pm b/fml/lib/FML/ML/Control.pm index 988bb220..93afeb78 100644 --- a/fml/lib/FML/ML/Control.pm +++ b/fml/lib/FML/ML/Control.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: Control.pm,v 1.13 2006/02/15 13:44:04 fukachan Exp $ +# $FML: Control.pm,v 1.14 2006/03/05 08:08:37 fukachan Exp $ # package FML::ML::Control; @@ -508,7 +508,7 @@ sub setup_listinfo sub install_createonpost { my ($self, $curproc, $command_context, $params) = @_; - my $config = $curproc->config(); + my $config = $curproc->config(); my $ml_name = $curproc->ml_name(); my $ml_domain = $curproc->ml_domain(); @@ -561,7 +561,7 @@ sub install_createonpost sub delete_createonpost { my ($self, $curproc, $command_context, $params) = @_; - my $config = $curproc->config(); + my $config = $curproc->config(); my $ml_name = $config->{ ml_name }; my $list = $config->get_as_array_ref('newml_command_mta_config_list'); diff --git a/fml/lib/FML/MTA/Control/Postfix.pm b/fml/lib/FML/MTA/Control/Postfix.pm index f5476494..3aadfb7b 100644 --- a/fml/lib/FML/MTA/Control/Postfix.pm +++ b/fml/lib/FML/MTA/Control/Postfix.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: Postfix.pm,v 1.11 2006/02/04 07:58:03 fukachan Exp $ +# $FML: Postfix.pm,v 1.12 2006/02/15 13:44:04 fukachan Exp $ # package FML::MTA::Control::Postfix; @@ -481,7 +481,7 @@ sub postfix_install_createonpost $rh->close(); } } - + # 2. install create-on-post entry into virtual. unless ($dup) { $curproc->ui_message("updating $virtual database for create-on-post"); @@ -529,7 +529,7 @@ sub postfix_delete_createonpost LINE: while($buf = <$rh>) { if ($buf =~ /<CREATE-ON-POST>/ - .. + .. $buf =~ /<\/CREATE-ON-POST>/) { next LINE; } @@ -543,7 +543,7 @@ sub postfix_delete_createonpost $curproc->ui_message("error: $s"); $curproc->logerror($s); } - + # rebuild .map file. $self->postfix_update_virtual_map($curproc, $params, $optargs); } diff --git a/fml/lib/FML/Mailer.pm b/fml/lib/FML/Mailer.pm index 51a57e63..dced141e 100644 --- a/fml/lib/FML/Mailer.pm +++ b/fml/lib/FML/Mailer.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: Mailer.pm,v 1.37 2006/04/03 09:53:29 fukachan Exp $ +# $FML: Mailer.pm,v 1.38 2006/04/05 11:39:11 fukachan Exp $ # package FML::Mailer; @@ -113,7 +113,7 @@ sub send $fp_log_info = sub { $curproc->log(@_);}; $fp_log_error = sub { $curproc->logerror(@_);}; $fp_log_debug = sub { $curproc->logdebug(@_);}; - $fp_smtplog = sub { + $fp_smtplog = sub { my ($s) = @_; print $s; print "\n" if $s !~ /\n$/o; }; @@ -177,7 +177,7 @@ sub send # address validater my $validater = sub { - my ($address) = @_; + my ($address) = @_; use FML::Restriction::Base; my $restriction = new FML::Restriction::Base; return $restriction->regexp_match( 'address', $address ); @@ -219,7 +219,7 @@ sub send if ($service->error) { $curproc->logerror($service->error); return 0;} # delivery not completes. - if ($service->get_not_done()) { + if ($service->get_not_done()) { $curproc->logdebug("delivery not done"); return 0; } diff --git a/fml/lib/FML/Merge/FML4/Rules.pm b/fml/lib/FML/Merge/FML4/Rules.pm index e310325e..fc5cb63e 100644 --- a/fml/lib/FML/Merge/FML4/Rules.pm +++ b/fml/lib/FML/Merge/FML4/Rules.pm @@ -8,7 +8,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$ +# $FML: Rules.pm,v 1.13 2006/05/17 12:23:54 fukachan Exp $ # package FML::Merge::FML4::Rules; @@ -37,7 +37,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'debug' && $diff->{ debug })) { @@ -46,7 +46,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'debug' && $diff->{ debug })) { @@ -55,7 +55,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LANGUAGE' && $diff->{ LANGUAGE })) { @@ -64,7 +64,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LANGUAGE' && $diff->{ LANGUAGE })) { @@ -73,7 +73,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MESSAGE_LANGUAGE' && $diff->{ MESSAGE_LANGUAGE })) { @@ -82,7 +82,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MESSAGE_LANGUAGE' && $diff->{ MESSAGE_LANGUAGE })) { @@ -91,7 +91,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DOMAINNAME' && $diff->{ DOMAINNAME })) { @@ -100,7 +100,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FQDN' && $diff->{ FQDN })) { @@ -109,7 +109,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAIL_LIST' && $diff->{ MAIL_LIST })) { @@ -118,7 +118,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_POST_FROM' && $diff->{ PERMIT_POST_FROM })) { @@ -127,7 +127,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REJECT_POST_HANDLER' && $diff->{ REJECT_POST_HANDLER })) { @@ -136,7 +136,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONTROL_ADDRESS' && $diff->{ CONTROL_ADDRESS })) { @@ -145,7 +145,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_COMMAND_FROM' && $diff->{ PERMIT_COMMAND_FROM })) { @@ -154,7 +154,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REJECT_COMMAND_HANDLER' && $diff->{ REJECT_COMMAND_HANDLER })) { @@ -163,7 +163,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAIL_LIST_ACCEPT_COMMAND' && $diff->{ MAIL_LIST_ACCEPT_COMMAND })) { @@ -172,7 +172,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAINTAINER' && $diff->{ MAINTAINER })) { @@ -181,7 +181,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAINTAINER_SIGNATURE' && $diff->{ MAINTAINER_SIGNATURE })) { @@ -190,7 +190,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ML_FN' && $diff->{ ML_FN })) { @@ -199,7 +199,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SPOOL_DIR' && $diff->{ SPOOL_DIR })) { @@ -208,7 +208,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TMP_DIR' && $diff->{ TMP_DIR })) { @@ -217,7 +217,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'VAR_DIR' && $diff->{ VAR_DIR })) { @@ -226,7 +226,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'VARLOG_DIR' && $diff->{ VARLOG_DIR })) { @@ -235,7 +235,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'VARRUN_DIR' && $diff->{ VARRUN_DIR })) { @@ -244,7 +244,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'VARDB_DIR' && $diff->{ VARDB_DIR })) { @@ -253,7 +253,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MANUAL_REGISTRATION_TYPE' && $diff->{ MANUAL_REGISTRATION_TYPE })) { @@ -262,7 +262,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MANUAL_REGISTRATION_TYPE' && $diff->{ MANUAL_REGISTRATION_TYPE })) { @@ -271,7 +271,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MANUAL_REGISTRATION_CONFIRMATION_FILE' && $diff->{ MANUAL_REGISTRATION_CONFIRMATION_FILE })) { @@ -280,7 +280,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_TYPE' && $diff->{ AUTO_REGISTRATION_TYPE })) { @@ -289,7 +289,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_TYPE' && $diff->{ AUTO_REGISTRATION_TYPE })) { @@ -298,7 +298,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_TYPE' && $diff->{ AUTO_REGISTRATION_TYPE })) { @@ -307,7 +307,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_TYPE' && $diff->{ AUTO_REGISTRATION_TYPE })) { @@ -316,7 +316,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_KEYWORD' && $diff->{ AUTO_REGISTRATION_KEYWORD })) { @@ -325,7 +325,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_KEYWORD' && $diff->{ AUTO_REGISTRATION_KEYWORD })) { @@ -334,7 +334,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_DEFAULT_MODE' && $diff->{ AUTO_REGISTRATION_DEFAULT_MODE })) { @@ -343,7 +343,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_ADDRESS' && $diff->{ CONFIRMATION_ADDRESS })) { @@ -352,7 +352,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_ADDRESS' && $diff->{ CONFIRMATION_ADDRESS })) { @@ -361,7 +361,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_SUBSCRIBE' && $diff->{ CONFIRMATION_SUBSCRIBE })) { @@ -370,7 +370,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_SUBSCRIBE' && $diff->{ CONFIRMATION_SUBSCRIBE })) { @@ -379,7 +379,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_KEYWORD' && $diff->{ CONFIRMATION_KEYWORD })) { @@ -388,7 +388,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_KEYWORD' && $diff->{ CONFIRMATION_KEYWORD })) { @@ -397,7 +397,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_WELCOME_STATEMENT' && $diff->{ CONFIRMATION_WELCOME_STATEMENT })) { @@ -406,7 +406,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_SUBSCRIBE_NEED_YOUR_NAME' && $diff->{ CONFIRMATION_SUBSCRIBE_NEED_YOUR_NAME })) { @@ -415,7 +415,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_SUBSCRIBE_NEED_YOUR_NAME' && $diff->{ CONFIRMATION_SUBSCRIBE_NEED_YOUR_NAME })) { @@ -424,7 +424,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_FILE' && $diff->{ CONFIRMATION_FILE })) { @@ -433,7 +433,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_EXPIRE' && $diff->{ CONFIRMATION_EXPIRE })) { @@ -442,7 +442,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_LIST' && $diff->{ CONFIRMATION_LIST })) { @@ -451,7 +451,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_SUBSCRIBE' && $diff->{ DEFAULT_SUBSCRIBE })) { @@ -460,7 +460,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_SUBSCRIBE' && $diff->{ DEFAULT_SUBSCRIBE })) { @@ -469,7 +469,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'WELCOME_FILE' && $diff->{ WELCOME_FILE })) { @@ -478,7 +478,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'WELCOME_STATEMENT' && $diff->{ WELCOME_STATEMENT })) { @@ -487,7 +487,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILE_TO_REGIST' && $diff->{ FILE_TO_REGIST })) { @@ -496,7 +496,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTERED_UNDELIVER_P' && $diff->{ AUTO_REGISTERED_UNDELIVER_P })) { @@ -505,7 +505,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTERED_UNDELIVER_P' && $diff->{ AUTO_REGISTERED_UNDELIVER_P })) { @@ -514,7 +514,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTERD_UNDELIVER_P' && $diff->{ AUTO_REGISTERD_UNDELIVER_P })) { @@ -523,7 +523,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_LINES_LIMIT' && $diff->{ AUTO_REGISTRATION_LINES_LIMIT })) { @@ -532,7 +532,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_LINES_LIMIT' && $diff->{ AUTO_REGISTRATION_LINES_LIMIT })) { @@ -541,7 +541,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMD_ACK_REQ_FILE' && $diff->{ CONFIRMD_ACK_REQ_FILE })) { @@ -550,7 +550,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMD_ACK_LOGFILE' && $diff->{ CONFIRMD_ACK_LOGFILE })) { @@ -559,7 +559,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMD_ACK_EXPIRE_UNIT' && $diff->{ CONFIRMD_ACK_EXPIRE_UNIT })) { @@ -568,7 +568,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMD_ACK_WAIT_UNIT' && $diff->{ CONFIRMD_ACK_WAIT_UNIT })) { @@ -577,7 +577,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION' && $diff->{ REMOTE_ADMINISTRATION })) { @@ -586,7 +586,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION' && $diff->{ REMOTE_ADMINISTRATION })) { @@ -595,7 +595,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_REQUIRE_PASSWORD' && $diff->{ REMOTE_ADMINISTRATION_REQUIRE_PASSWORD })) { @@ -604,7 +604,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_REQUIRE_PASSWORD' && $diff->{ REMOTE_ADMINISTRATION_REQUIRE_PASSWORD })) { @@ -613,7 +613,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_AUTH_TYPE' && $diff->{ REMOTE_ADMINISTRATION_AUTH_TYPE })) { @@ -622,7 +622,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_AUTH_TYPE' && $diff->{ REMOTE_ADMINISTRATION_AUTH_TYPE })) { @@ -631,7 +631,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_AUTH_TYPE' && $diff->{ REMOTE_ADMINISTRATION_AUTH_TYPE })) { @@ -640,7 +640,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_AUTH_TYPE' && $diff->{ REMOTE_ADMINISTRATION_AUTH_TYPE })) { @@ -649,7 +649,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_AUTH_TYPE' && $diff->{ REMOTE_ADMINISTRATION_AUTH_TYPE })) { @@ -658,7 +658,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_AUTH_TYPE' && $diff->{ REMOTE_ADMINISTRATION_AUTH_TYPE })) { @@ -667,7 +667,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_AUTH_TYPE' && $diff->{ REMOTE_ADMINISTRATION_AUTH_TYPE })) { @@ -676,7 +676,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_MEMBER_LIST' && $diff->{ ADMIN_MEMBER_LIST })) { @@ -685,7 +685,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_HELP_FILE' && $diff->{ ADMIN_HELP_FILE })) { @@ -694,7 +694,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PASSWD_FILE' && $diff->{ PASSWD_FILE })) { @@ -703,7 +703,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_ADD_SEND_WELCOME_FILE' && $diff->{ ADMIN_ADD_SEND_WELCOME_FILE })) { @@ -712,7 +712,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_ADD_SEND_WELCOME_FILE' && $diff->{ ADMIN_ADD_SEND_WELCOME_FILE })) { @@ -721,7 +721,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_LOG_DEFAULT_LINE_LIMIT' && $diff->{ ADMIN_LOG_DEFAULT_LINE_LIMIT })) { @@ -730,7 +730,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PGP_PATH' && $diff->{ PGP_PATH })) { @@ -739,7 +739,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_FML40_PGP_PATH' && $diff->{ USE_FML40_PGP_PATH })) { @@ -748,7 +748,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DIST_AUTH_KEYRING_DIR' && $diff->{ DIST_AUTH_KEYRING_DIR })) { @@ -757,7 +757,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DIST_ENCRYPT_KEYRING_DIR' && $diff->{ DIST_ENCRYPT_KEYRING_DIR })) { @@ -766,7 +766,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_AUTH_KEYRING_DIR' && $diff->{ ADMIN_AUTH_KEYRING_DIR })) { @@ -775,7 +775,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_ENCRYPT_KEYRING_DIR' && $diff->{ ADMIN_ENCRYPT_KEYRING_DIR })) { @@ -784,7 +784,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MODERATOR_MEMBER_LIST' && $diff->{ MODERATOR_MEMBER_LIST })) { @@ -793,7 +793,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MODERATOR_EXPIRE_LIMIT' && $diff->{ MODERATOR_EXPIRE_LIMIT })) { @@ -802,7 +802,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REJECT_ADDR' && $diff->{ REJECT_ADDR })) { @@ -811,7 +811,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REJECT_ADDR_LIST' && $diff->{ REJECT_ADDR_LIST })) { @@ -820,7 +820,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOT_USE_UNIX_FROM_LOOP_CHECK' && $diff->{ NOT_USE_UNIX_FROM_LOOP_CHECK })) { @@ -829,7 +829,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOT_USE_UNIX_FROM_LOOP_CHECK' && $diff->{ NOT_USE_UNIX_FROM_LOOP_CHECK })) { @@ -838,7 +838,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CHECK_MESSAGE_ID' && $diff->{ CHECK_MESSAGE_ID })) { @@ -847,7 +847,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CHECK_MESSAGE_ID' && $diff->{ CHECK_MESSAGE_ID })) { @@ -856,7 +856,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CHECK_MAILBODY_CKSUM' && $diff->{ CHECK_MAILBODY_CKSUM })) { @@ -865,7 +865,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CHECK_MAILBODY_CKSUM' && $diff->{ CHECK_MAILBODY_CKSUM })) { @@ -874,7 +874,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOG_CONNECTION' && $diff->{ LOG_CONNECTION })) { @@ -883,7 +883,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADDR_CHECK_MAX' && $diff->{ ADDR_CHECK_MAX })) { @@ -892,7 +892,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'INCOMING_MAIL_SIZE_LIMIT' && $diff->{ INCOMING_MAIL_SIZE_LIMIT })) { @@ -901,7 +901,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'INCOMING_MAIL_SIZE_LIMIT' && $diff->{ INCOMING_MAIL_SIZE_LIMIT })) { @@ -910,7 +910,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOTIFY_MAIL_SIZE_OVERFLOW' && $diff->{ NOTIFY_MAIL_SIZE_OVERFLOW })) { @@ -919,7 +919,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOTIFY_MAIL_SIZE_OVERFLOW' && $diff->{ NOTIFY_MAIL_SIZE_OVERFLOW })) { @@ -928,7 +928,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ANNOUNCE_MAIL_SIZE_OVERFLOW' && $diff->{ ANNOUNCE_MAIL_SIZE_OVERFLOW })) { @@ -937,7 +937,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ANNOUNCE_MAIL_SIZE_OVERFLOW' && $diff->{ ANNOUNCE_MAIL_SIZE_OVERFLOW })) { @@ -946,7 +946,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAX_MEMBER_LIMIT' && $diff->{ MAX_MEMBER_LIMIT })) { @@ -955,7 +955,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_DISTRIBUTE_FILTER' && $diff->{ USE_DISTRIBUTE_FILTER })) { @@ -964,7 +964,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_DISTRIBUTE_FILTER' && $diff->{ USE_DISTRIBUTE_FILTER })) { @@ -973,7 +973,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DISTRIBUTE_FILTER_HOOK' && $diff->{ DISTRIBUTE_FILTER_HOOK })) { @@ -982,7 +982,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_NOTIFY_REJECTION' && $diff->{ FILTER_NOTIFY_REJECTION })) { @@ -991,7 +991,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_NOTIFY_REJECTION' && $diff->{ FILTER_NOTIFY_REJECTION })) { @@ -1000,7 +1000,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_NULL_BODY' && $diff->{ FILTER_ATTR_REJECT_NULL_BODY })) { @@ -1009,7 +1009,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_NULL_BODY' && $diff->{ FILTER_ATTR_REJECT_NULL_BODY })) { @@ -1018,7 +1018,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_COMMAND' && $diff->{ FILTER_ATTR_REJECT_COMMAND })) { @@ -1027,7 +1027,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_COMMAND' && $diff->{ FILTER_ATTR_REJECT_COMMAND })) { @@ -1036,7 +1036,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_2BYTES_COMMAND' && $diff->{ FILTER_ATTR_REJECT_2BYTES_COMMAND })) { @@ -1045,7 +1045,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_2BYTES_COMMAND' && $diff->{ FILTER_ATTR_REJECT_2BYTES_COMMAND })) { @@ -1054,7 +1054,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_INVALID_COMMAND' && $diff->{ FILTER_ATTR_REJECT_INVALID_COMMAND })) { @@ -1063,7 +1063,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_INVALID_COMMAND' && $diff->{ FILTER_ATTR_REJECT_INVALID_COMMAND })) { @@ -1072,7 +1072,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_ONE_LINE_BODY' && $diff->{ FILTER_ATTR_REJECT_ONE_LINE_BODY })) { @@ -1081,7 +1081,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_ONE_LINE_BODY' && $diff->{ FILTER_ATTR_REJECT_ONE_LINE_BODY })) { @@ -1090,7 +1090,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_MS_GUID' && $diff->{ FILTER_ATTR_REJECT_MS_GUID })) { @@ -1099,7 +1099,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_MS_GUID' && $diff->{ FILTER_ATTR_REJECT_MS_GUID })) { @@ -1108,7 +1108,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_INVALID_JAPANESE' && $diff->{ FILTER_ATTR_REJECT_INVALID_JAPANESE })) { @@ -1117,7 +1117,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_INVALID_JAPANESE' && $diff->{ FILTER_ATTR_REJECT_INVALID_JAPANESE })) { @@ -1126,7 +1126,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONTENT_HANDLER_CUTOFF_EMPTY_MESSAGE' && $diff->{ CONTENT_HANDLER_CUTOFF_EMPTY_MESSAGE })) { @@ -1135,7 +1135,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONTENT_HANDLER_REJECT_EMPTY_MESSAGE' && $diff->{ CONTENT_HANDLER_REJECT_EMPTY_MESSAGE })) { @@ -1144,7 +1144,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_HANKAKU_CONVERTER' && $diff->{ USE_HANKAKU_CONVERTER })) { @@ -1153,7 +1153,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_HANKAKU_CONVERTER' && $diff->{ USE_HANKAKU_CONVERTER })) { @@ -1162,7 +1162,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_MAIL_DEFAULT_HANDLER' && $diff->{ HTML_MAIL_DEFAULT_HANDLER })) { @@ -1171,7 +1171,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_MTI' && $diff->{ USE_MTI })) { @@ -1180,7 +1180,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MTI_WARN_INTERVAL' && $diff->{ MTI_WARN_INTERVAL })) { @@ -1189,7 +1189,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MTI_WARN_LASTLOG' && $diff->{ MTI_WARN_LASTLOG })) { @@ -1198,7 +1198,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MTI_EXPIRE_UNIT' && $diff->{ MTI_EXPIRE_UNIT }) || ($key eq 'MTI_BURST_SOFT_LIMIT' && $diff->{ MTI_BURST_SOFT_LIMIT })) { @@ -1209,7 +1209,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MTI_BURST_HARD_LIMIT' && $diff->{ MTI_BURST_HARD_LIMIT })) { @@ -1218,7 +1218,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MTI_COST_EVAL_FUNCTION' && $diff->{ MTI_COST_EVAL_FUNCTION })) { @@ -1227,7 +1227,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MTI_MAIL_FROM_HINT_LIST' && $diff->{ MTI_MAIL_FROM_HINT_LIST })) { @@ -1236,7 +1236,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUBSCRIBE_ANNOUNCE_FORWARD_TYPE' && $diff->{ SUBSCRIBE_ANNOUNCE_FORWARD_TYPE })) { @@ -1245,7 +1245,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUBSCRIBE_ANNOUNCE_FORWARD_TYPE' && $diff->{ SUBSCRIBE_ANNOUNCE_FORWARD_TYPE })) { @@ -1254,7 +1254,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'UNSUBSCRIBE_AUTH_TYPE' && $diff->{ UNSUBSCRIBE_AUTH_TYPE })) { @@ -1263,7 +1263,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'UNSUBSCRIBE_AUTH_TYPE' && $diff->{ UNSUBSCRIBE_AUTH_TYPE })) { @@ -1272,7 +1272,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CHADDR_AUTH_TYPE' && $diff->{ CHADDR_AUTH_TYPE })) { @@ -1281,7 +1281,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CHADDR_AUTH_TYPE' && $diff->{ CHADDR_AUTH_TYPE })) { @@ -1290,7 +1290,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_LOG_MAIL' && $diff->{ USE_LOG_MAIL })) { @@ -1299,7 +1299,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_LOG_MAIL' && $diff->{ USE_LOG_MAIL })) { @@ -1308,7 +1308,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOG_MAIL_DIR' && $diff->{ LOG_MAIL_DIR })) { @@ -1317,7 +1317,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOG_MAIL_SEQ' && $diff->{ LOG_MAIL_SEQ })) { @@ -1326,7 +1326,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NUM_LOG_MAIL' && $diff->{ NUM_LOG_MAIL })) { @@ -1335,7 +1335,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOG_MAIL_FILE_SIZE_MAX' && $diff->{ LOG_MAIL_FILE_SIZE_MAX })) { @@ -1344,7 +1344,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_ENCRYPTED_DISTRIBUTION' && $diff->{ USE_ENCRYPTED_DISTRIBUTION })) { @@ -1353,7 +1353,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_ENCRYPTED_DISTRIBUTION' && $diff->{ USE_ENCRYPTED_DISTRIBUTION })) { @@ -1362,7 +1362,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ENCRYPTED_DISTRIBUTION_TYPE' && $diff->{ ENCRYPTED_DISTRIBUTION_TYPE })) { @@ -1371,7 +1371,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ENCRYPTED_DISTRIBUTION_TYPE' && $diff->{ ENCRYPTED_DISTRIBUTION_TYPE })) { @@ -1380,7 +1380,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ENCRYPTED_DISTRIBUTION_TYPE' && $diff->{ ENCRYPTED_DISTRIBUTION_TYPE })) { @@ -1389,7 +1389,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ENCRYPTED_DISTRIBUTION_TYPE' && $diff->{ ENCRYPTED_DISTRIBUTION_TYPE })) { @@ -1398,7 +1398,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DATE_TYPE' && $diff->{ DATE_TYPE })) { @@ -1407,7 +1407,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DATE_TYPE' && $diff->{ DATE_TYPE })) { @@ -1416,7 +1416,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'XMLNAME' && $diff->{ XMLNAME })) { @@ -1425,7 +1425,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'XMLNAME' && $diff->{ XMLNAME })) { @@ -1434,7 +1434,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'XMLCOUNT' && $diff->{ XMLCOUNT })) { @@ -1443,7 +1443,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'XMLCOUNT' && $diff->{ XMLCOUNT })) { @@ -1452,7 +1452,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUBJECT_TAG_TYPE' && $diff->{ SUBJECT_TAG_TYPE })) { @@ -1461,7 +1461,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'BRACKET' && $diff->{ BRACKET })) { @@ -1470,7 +1470,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'STRIP_BRACKETS' && $diff->{ STRIP_BRACKETS })) { @@ -1479,7 +1479,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'BRACKET_SEPARATOR' && $diff->{ BRACKET_SEPARATOR })) { @@ -1488,7 +1488,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUBJECT_FREE_FORM' && $diff->{ SUBJECT_FREE_FORM })) { @@ -1497,7 +1497,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUBJECT_FREE_FORM_REGEXP' && $diff->{ SUBJECT_FREE_FORM_REGEXP })) { @@ -1506,7 +1506,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUBJECT_FORM_LONG_ID' && $diff->{ SUBJECT_FORM_LONG_ID })) { @@ -1515,7 +1515,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_ERRORS_TO' && $diff->{ USE_ERRORS_TO })) { @@ -1524,7 +1524,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_ERRORS_TO' && $diff->{ USE_ERRORS_TO })) { @@ -1533,7 +1533,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ERRORS_TO' && $diff->{ ERRORS_TO })) { @@ -1542,7 +1542,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_ORIGINAL_MESSAGE_ID' && $diff->{ USE_ORIGINAL_MESSAGE_ID })) { @@ -1551,7 +1551,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_ORIGINAL_MESSAGE_ID' && $diff->{ USE_ORIGINAL_MESSAGE_ID })) { @@ -1560,7 +1560,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PRECEDENCE' && $diff->{ PRECEDENCE })) { @@ -1569,7 +1569,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'APPEND_STARDATE' && $diff->{ APPEND_STARDATE })) { @@ -1578,7 +1578,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'APPEND_STARDATE' && $diff->{ APPEND_STARDATE })) { @@ -1587,7 +1587,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_RFC2369' && $diff->{ USE_RFC2369 })) { @@ -1596,7 +1596,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_RFC2369' && $diff->{ USE_RFC2369 })) { @@ -1605,7 +1605,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIST_SOFTWARE' && $diff->{ LIST_SOFTWARE })) { @@ -1614,7 +1614,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIST_POST' && $diff->{ LIST_POST })) { @@ -1623,7 +1623,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIST_OWNER' && $diff->{ LIST_OWNER })) { @@ -1632,7 +1632,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIST_HELP' && $diff->{ LIST_HELP })) { @@ -1641,7 +1641,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIST_SUBSCRIBE' && $diff->{ LIST_SUBSCRIBE })) { @@ -1650,7 +1650,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIST_UNSUBSCRIBE' && $diff->{ LIST_UNSUBSCRIBE })) { @@ -1659,7 +1659,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIST_ID' && $diff->{ LIST_ID })) { @@ -1668,7 +1668,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REWRITE_TO' && $diff->{ REWRITE_TO })) { @@ -1677,7 +1677,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REWRITE_TO' && $diff->{ REWRITE_TO })) { @@ -1686,7 +1686,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REWRITE_TO' && $diff->{ REWRITE_TO })) { @@ -1695,7 +1695,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'Subject' && $diff->{ Subject })) { @@ -1704,7 +1704,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'From_address' && $diff->{ From_address })) { @@ -1713,7 +1713,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'User' && $diff->{ User })) { @@ -1722,7 +1722,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'Date' && $diff->{ Date })) { @@ -1731,7 +1731,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TZone' && $diff->{ TZone })) { @@ -1740,7 +1740,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TZONE_DST' && $diff->{ TZONE_DST })) { @@ -1749,7 +1749,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PASS_ALL_FIELDS_IN_HEADER' && $diff->{ PASS_ALL_FIELDS_IN_HEADER })) { @@ -1758,7 +1758,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PASS_ALL_FIELDS_IN_HEADER' && $diff->{ PASS_ALL_FIELDS_IN_HEADER })) { @@ -1767,7 +1767,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUPERFLUOUS_HEADERS' && $diff->{ SUPERFLUOUS_HEADERS })) { @@ -1776,7 +1776,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUPERFLUOUS_HEADERS' && $diff->{ SUPERFLUOUS_HEADERS })) { @@ -1785,7 +1785,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SKIP_FIELDS' && $diff->{ SKIP_FIELDS })) { @@ -1794,7 +1794,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ALLOW_WRONG_LINES_IN_HEADER' && $diff->{ ALLOW_WRONG_LINES_IN_HEADER })) { @@ -1803,7 +1803,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'COMMAND_SYNTAX_EXTENSION' && $diff->{ COMMAND_SYNTAX_EXTENSION })) { @@ -1812,7 +1812,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_SUBJECT_AS_COMMANDS' && $diff->{ USE_SUBJECT_AS_COMMANDS })) { @@ -1821,7 +1821,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_WARNING' && $diff->{ USE_WARNING })) { @@ -1830,7 +1830,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_WARNING' && $diff->{ USE_WARNING })) { @@ -1839,7 +1839,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'COMMAND_ONLY_SERVER' && $diff->{ COMMAND_ONLY_SERVER })) { @@ -1848,7 +1848,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'COMMAND_CHECK_LIMIT' && $diff->{ COMMAND_CHECK_LIMIT })) { @@ -1857,7 +1857,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'GUIDE_CHECK_LIMIT' && $diff->{ GUIDE_CHECK_LIMIT })) { @@ -1866,7 +1866,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'GUIDE_KEYWORD' && $diff->{ GUIDE_KEYWORD })) { @@ -1875,7 +1875,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAXLEN_COMMAND_INPUT' && $diff->{ MAXLEN_COMMAND_INPUT }) || ($key eq 'MAXLEN_COMMAND_INPUT' && $diff->{ MAXLEN_COMMAND_INPUT })) { @@ -1886,7 +1886,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAXNUM_COMMAND_INPUT' && $diff->{ MAXNUM_COMMAND_INPUT })) { @@ -1895,7 +1895,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CHADDR_KEYWORD' && $diff->{ CHADDR_KEYWORD })) { @@ -1904,7 +1904,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CHADDR_REPLY_TO' && $diff->{ CHADDR_REPLY_TO })) { @@ -1913,7 +1913,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_CHADDR_REPLY_TO' && $diff->{ ADMIN_CHADDR_REPLY_TO })) { @@ -1922,7 +1922,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MGET_MODE_DEFAULT' && $diff->{ MGET_MODE_DEFAULT })) { @@ -1931,7 +1931,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MGET_TEXT_MODE_DEFAULT' && $diff->{ MGET_TEXT_MODE_DEFAULT })) { @@ -1940,7 +1940,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAIL_LENGTH_LIMIT' && $diff->{ MAIL_LENGTH_LIMIT })) { @@ -1949,7 +1949,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SLEEPTIME' && $diff->{ SLEEPTIME })) { @@ -1958,7 +1958,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_VERSION' && $diff->{ MIME_VERSION })) { @@ -1967,7 +1967,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_CONTENT_TYPE' && $diff->{ MIME_CONTENT_TYPE })) { @@ -1976,7 +1976,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_MULTIPART_BOUNDARY' && $diff->{ MIME_MULTIPART_BOUNDARY })) { @@ -1985,7 +1985,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_MULTIPART_CLOSE_DELIMITER' && $diff->{ MIME_MULTIPART_CLOSE_DELIMITER })) { @@ -1994,7 +1994,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_MULTIPART_DELIMITER' && $diff->{ MIME_MULTIPART_DELIMITER })) { @@ -2003,7 +2003,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_MULTIPART_PREAMBLE' && $diff->{ MIME_MULTIPART_PREAMBLE })) { @@ -2012,7 +2012,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_MULTIPART_TRAILER' && $diff->{ MIME_MULTIPART_TRAILER })) { @@ -2021,7 +2021,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_SJIS_IN_ISH' && $diff->{ USE_SJIS_IN_ISH })) { @@ -2030,7 +2030,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RFC1153_ISSUE' && $diff->{ RFC1153_ISSUE })) { @@ -2039,7 +2039,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RFC1153_VOL' && $diff->{ RFC1153_VOL })) { @@ -2048,7 +2048,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RFC1153_SEQUENCE_FILE' && $diff->{ RFC1153_SEQUENCE_FILE })) { @@ -2057,7 +2057,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_DOT_QMAIL_EXT' && $diff->{ USE_DOT_QMAIL_EXT })) { @@ -2066,7 +2066,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FORCE_COMMAND_REPLY_TO' && $diff->{ FORCE_COMMAND_REPLY_TO })) { @@ -2075,7 +2075,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MGET_SUBJECT_TEMPLATE' && $diff->{ MGET_SUBJECT_TEMPLATE })) { @@ -2084,7 +2084,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MESSAGE_RETURN_ADDR_POLICY' && $diff->{ MESSAGE_RETURN_ADDR_POLICY })) { @@ -2093,7 +2093,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_SUBJECT_TEMPLATE' && $diff->{ MSEND_SUBJECT_TEMPLATE })) { @@ -2102,7 +2102,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_RC' && $diff->{ MSEND_RC })) { @@ -2111,7 +2111,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_MODE_DEFAULT' && $diff->{ MSEND_MODE_DEFAULT })) { @@ -2120,7 +2120,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_DEFAULT_SUBJECT' && $diff->{ MSEND_DEFAULT_SUBJECT })) { @@ -2129,7 +2129,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_NOTIFICATION' && $diff->{ MSEND_NOTIFICATION })) { @@ -2138,7 +2138,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_NOTIFICATION_SUBJECT' && $diff->{ MSEND_NOTIFICATION_SUBJECT })) { @@ -2147,7 +2147,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_NOT_USE_X_ML_INFO' && $diff->{ MSEND_NOT_USE_X_ML_INFO })) { @@ -2156,7 +2156,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_NOT_USE_X_ML_INFO' && $diff->{ MSEND_NOT_USE_X_ML_INFO })) { @@ -2165,7 +2165,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_NOT_USE_NEWSYSLOG' && $diff->{ MSEND_NOT_USE_NEWSYSLOG })) { @@ -2174,7 +2174,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOG_MESSAGE_ID' && $diff->{ LOG_MESSAGE_ID })) { @@ -2183,7 +2183,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MESSAGE_ID_CACHE_BUFSIZE' && $diff->{ MESSAGE_ID_CACHE_BUFSIZE })) { @@ -2192,7 +2192,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOG_MAILBODY_CKSUM' && $diff->{ LOG_MAILBODY_CKSUM })) { @@ -2201,7 +2201,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MEMBER_LIST' && $diff->{ MEMBER_LIST })) { @@ -2210,7 +2210,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ACTIVE_LIST' && $diff->{ ACTIVE_LIST })) { @@ -2219,7 +2219,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'GUIDE_FILE' && $diff->{ GUIDE_FILE })) { @@ -2228,7 +2228,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'OBJECTIVE_FILE' && $diff->{ OBJECTIVE_FILE })) { @@ -2237,7 +2237,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HELP_FILE' && $diff->{ HELP_FILE })) { @@ -2246,7 +2246,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DENY_FILE' && $diff->{ DENY_FILE })) { @@ -2255,7 +2255,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOGFILE' && $diff->{ LOGFILE })) { @@ -2264,7 +2264,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MGET_LOGFILE' && $diff->{ MGET_LOGFILE })) { @@ -2273,7 +2273,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOGFILE_SUFFIX' && $diff->{ LOGFILE_SUFFIX })) { @@ -2282,7 +2282,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEBUG_LOGFILE' && $diff->{ DEBUG_LOGFILE })) { @@ -2291,7 +2291,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUMMARY_FILE' && $diff->{ SUMMARY_FILE })) { @@ -2300,7 +2300,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SEQUENCE_FILE' && $diff->{ SEQUENCE_FILE })) { @@ -2309,7 +2309,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCK_FILE' && $diff->{ LOCK_FILE })) { @@ -2318,7 +2318,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCK_DIR' && $diff->{ LOCK_DIR })) { @@ -2327,7 +2327,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCKDIR' && $diff->{ LOCKDIR })) { @@ -2336,7 +2336,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCKFILE' && $diff->{ LOCKFILE })) { @@ -2345,7 +2345,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_INET6' && $diff->{ USE_INET6 })) { @@ -2354,7 +2354,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_INET6' && $diff->{ USE_INET6 })) { @@ -2363,7 +2363,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HOST' && $diff->{ HOST })) { @@ -2372,7 +2372,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PORT' && $diff->{ PORT })) { @@ -2381,7 +2381,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SMTP_SENDER' && $diff->{ SMTP_SENDER })) { @@ -2390,7 +2390,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SMTP_LOG' && $diff->{ SMTP_LOG })) { @@ -2399,7 +2399,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_SMTP_LOG_ROTATE' && $diff->{ USE_SMTP_LOG_ROTATE })) { @@ -2408,7 +2408,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_SMTP_LOG_ROTATE' && $diff->{ USE_SMTP_LOG_ROTATE })) { @@ -2417,7 +2417,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SMTP_LOG_ROTATE_EXPIRE_LIMIT' && $diff->{ SMTP_LOG_ROTATE_EXPIRE_LIMIT })) { @@ -2426,7 +2426,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SMTP_LOG_ROTATE_EXPIRE_LIMIT' && $diff->{ SMTP_LOG_ROTATE_EXPIRE_LIMIT })) { @@ -2435,7 +2435,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NUM_SMTP_LOG_ROTATE' && $diff->{ NUM_SMTP_LOG_ROTATE })) { @@ -2444,7 +2444,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SMTP_LOG_ROTATE_TYPE' && $diff->{ SMTP_LOG_ROTATE_TYPE })) { @@ -2453,7 +2453,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SMTP_LOG_ROTATE_TYPE' && $diff->{ SMTP_LOG_ROTATE_TYPE })) { @@ -2462,7 +2462,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOT_TRACE_SMTP' && $diff->{ NOT_TRACE_SMTP })) { @@ -2471,7 +2471,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOT_TRACE_SMTP' && $diff->{ NOT_TRACE_SMTP })) { @@ -2480,7 +2480,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TRACE_SMTP_DELAY' && $diff->{ TRACE_SMTP_DELAY })) { @@ -2489,7 +2489,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_SMTP_PROFILE' && $diff->{ USE_SMTP_PROFILE })) { @@ -2498,7 +2498,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MCI_SMTP_HOSTS' && $diff->{ MCI_SMTP_HOSTS })) { @@ -2507,7 +2507,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_RELAY_SERVER' && $diff->{ DEFAULT_RELAY_SERVER })) { @@ -2516,7 +2516,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RELAY_HACK' && $diff->{ RELAY_HACK })) { @@ -2525,7 +2525,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CF_DEF' && $diff->{ CF_DEF })) { @@ -2534,7 +2534,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_OUTGOING_ADDRESS' && $diff->{ USE_OUTGOING_ADDRESS })) { @@ -2543,7 +2543,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'OUTGOING_ADDRESS' && $diff->{ OUTGOING_ADDRESS })) { @@ -2552,7 +2552,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_VERP' && $diff->{ USE_VERP })) { @@ -2561,7 +2561,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'POSTFIX_VERP_DELIMITERS' && $diff->{ POSTFIX_VERP_DELIMITERS })) { @@ -2570,7 +2570,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TRY_VERP_PER_DAY' && $diff->{ TRY_VERP_PER_DAY })) { @@ -2579,7 +2579,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOT_USE_ESMTP_PIPELINING' && $diff->{ NOT_USE_ESMTP_PIPELINING })) { @@ -2588,7 +2588,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_SMTPFEED_F_OPTION' && $diff->{ USE_SMTPFEED_F_OPTION })) { @@ -2597,7 +2597,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_MIME' && $diff->{ USE_MIME })) { @@ -2606,7 +2606,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_MIME' && $diff->{ USE_MIME })) { @@ -2615,7 +2615,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_BROKEN_ENCODING_FIXUP' && $diff->{ MIME_BROKEN_ENCODING_FIXUP })) { @@ -2624,7 +2624,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_DECODED_ARTICLE' && $diff->{ MIME_DECODED_ARTICLE })) { @@ -2633,7 +2633,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PREAMBLE_MAILBODY' && $diff->{ PREAMBLE_MAILBODY })) { @@ -2642,7 +2642,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TRAILER_MAILBODY' && $diff->{ TRAILER_MAILBODY })) { @@ -2651,7 +2651,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'GOOD_BYE_PHRASE' && $diff->{ GOOD_BYE_PHRASE })) { @@ -2660,7 +2660,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FACE_MARK' && $diff->{ FACE_MARK })) { @@ -2669,7 +2669,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PROC_GEN_INFO' && $diff->{ PROC_GEN_INFO })) { @@ -2678,7 +2678,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_FLOCK' && $diff->{ USE_FLOCK })) { @@ -2687,7 +2687,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_FLOCK' && $diff->{ USE_FLOCK })) { @@ -2696,7 +2696,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAX_TIMEOUT' && $diff->{ MAX_TIMEOUT })) { @@ -2705,7 +2705,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOT_USE_SPOOL' && $diff->{ NOT_USE_SPOOL })) { @@ -2714,7 +2714,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOT_USE_SPOOL' && $diff->{ NOT_USE_SPOOL })) { @@ -2723,7 +2723,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'COMPAT_FML15' && $diff->{ COMPAT_FML15 })) { @@ -2732,7 +2732,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NEWSYSLOG_MAX' && $diff->{ NEWSYSLOG_MAX })) { @@ -2741,7 +2741,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CRONTAB' && $diff->{ CRONTAB })) { @@ -2750,7 +2750,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CRON_PIDFILE' && $diff->{ CRON_PIDFILE })) { @@ -2759,7 +2759,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CRON_NOTIFY' && $diff->{ CRON_NOTIFY })) { @@ -2768,7 +2768,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_CROSSPOST' && $diff->{ USE_CROSSPOST })) { @@ -2777,7 +2777,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_MEMBER_NAME' && $diff->{ USE_MEMBER_NAME })) { @@ -2786,7 +2786,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_EXPIRE' && $diff->{ USE_EXPIRE })) { @@ -2795,7 +2795,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_EXPIRE' && $diff->{ USE_EXPIRE })) { @@ -2804,7 +2804,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'EXPIRE_SUMMARY' && $diff->{ EXPIRE_SUMMARY })) { @@ -2813,7 +2813,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'EXPIRE_SUMMARY' && $diff->{ EXPIRE_SUMMARY })) { @@ -2822,7 +2822,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'EXPIRE_LIMIT' && $diff->{ EXPIRE_LIMIT })) { @@ -2831,7 +2831,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_ARCHIVE' && $diff->{ USE_ARCHIVE })) { @@ -2840,7 +2840,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ARCHIVE_UNIT' && $diff->{ ARCHIVE_UNIT })) { @@ -2849,7 +2849,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_ARCHIVE_UNIT' && $diff->{ DEFAULT_ARCHIVE_UNIT })) { @@ -2858,7 +2858,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ARCHIVE_DIR' && $diff->{ ARCHIVE_DIR })) { @@ -2867,7 +2867,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'INDEX_FILE' && $diff->{ INDEX_FILE })) { @@ -2876,7 +2876,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'INDEX_SHOW_DIRNAME' && $diff->{ INDEX_SHOW_DIRNAME })) { @@ -2885,7 +2885,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIBRARY_DIR' && $diff->{ LIBRARY_DIR })) { @@ -2894,7 +2894,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIBRARY_ARCHIVE_DIR' && $diff->{ LIBRARY_ARCHIVE_DIR })) { @@ -2903,7 +2903,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOGFILE_NEWSYSLOG_LIMIT' && $diff->{ LOGFILE_NEWSYSLOG_LIMIT })) { @@ -2912,7 +2912,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AMLIST_NEWSYSLOG_LIMIT' && $diff->{ AMLIST_NEWSYSLOG_LIMIT })) { @@ -2921,7 +2921,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_HTML_GEN' && $diff->{ AUTO_HTML_GEN })) { @@ -2930,7 +2930,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_HTML_GEN' && $diff->{ AUTO_HTML_GEN })) { @@ -2939,7 +2939,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_NEW_HTML_GEN' && $diff->{ USE_NEW_HTML_GEN })) { @@ -2948,7 +2948,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_NEW_HTML_GEN' && $diff->{ USE_NEW_HTML_GEN })) { @@ -2957,7 +2957,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_THREAD' && $diff->{ HTML_THREAD })) { @@ -2966,7 +2966,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_THREAD' && $diff->{ HTML_THREAD })) { @@ -2975,7 +2975,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_INDEX_REVERSE_ORDER' && $diff->{ HTML_INDEX_REVERSE_ORDER })) { @@ -2984,7 +2984,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_INDEX_REVERSE_ORDER' && $diff->{ HTML_INDEX_REVERSE_ORDER })) { @@ -2993,7 +2993,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_DIR' && $diff->{ HTML_DIR })) { @@ -3002,7 +3002,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_EXPIRE_LIMIT' && $diff->{ HTML_EXPIRE_LIMIT })) { @@ -3011,7 +3011,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_INDEX_TITLE' && $diff->{ HTML_INDEX_TITLE })) { @@ -3020,7 +3020,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_DATA_CACHE' && $diff->{ HTML_DATA_CACHE })) { @@ -3029,7 +3029,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_DATA_THREAD' && $diff->{ HTML_DATA_THREAD })) { @@ -3038,7 +3038,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_OUTPUT_FILTER' && $diff->{ HTML_OUTPUT_FILTER })) { @@ -3047,7 +3047,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_STYLESHEET_BASENAME' && $diff->{ HTML_STYLESHEET_BASENAME })) { @@ -3056,7 +3056,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_THREAD_REF_TYPE' && $diff->{ HTML_THREAD_REF_TYPE })) { @@ -3065,7 +3065,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_THREAD_REF_TYPE' && $diff->{ HTML_THREAD_REF_TYPE })) { @@ -3074,7 +3074,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_THREAD_SORT_TYPE' && $diff->{ HTML_THREAD_SORT_TYPE })) { @@ -3083,7 +3083,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_THREAD_SORT_TYPE' && $diff->{ HTML_THREAD_SORT_TYPE })) { @@ -3092,7 +3092,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_INDEX_UNIT' && $diff->{ HTML_INDEX_UNIT })) { @@ -3101,7 +3101,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_INDENT_STYLE' && $diff->{ HTML_INDENT_STYLE })) { @@ -3110,7 +3110,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_MULTIPART_IMAGE_REF_TYPE' && $diff->{ HTML_MULTIPART_IMAGE_REF_TYPE })) { @@ -3119,7 +3119,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_DEFAULT_UMASK' && $diff->{ HTML_DEFAULT_UMASK })) { @@ -3128,7 +3128,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_WRITE_UMASK' && $diff->{ HTML_WRITE_UMASK })) { @@ -3137,7 +3137,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_DATABASE' && $diff->{ USE_DATABASE })) { @@ -3146,7 +3146,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DATABASE_METHOD' && $diff->{ DATABASE_METHOD })) { @@ -3155,7 +3155,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DATABASE_CACHE_FILE_SUFFIX' && $diff->{ DATABASE_CACHE_FILE_SUFFIX })) { @@ -3164,7 +3164,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DATABASE_DRIVER' && $diff->{ DATABASE_DRIVER })) { @@ -3173,7 +3173,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DATABASE_DRIVER_ATTRIBUTES' && $diff->{ DATABASE_DRIVER_ATTRIBUTES })) { @@ -3182,7 +3182,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SQL_SERVER_HOST' && $diff->{ SQL_SERVER_HOST })) { @@ -3191,7 +3191,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SQL_SERVER_PORT' && $diff->{ SQL_SERVER_PORT })) { @@ -3200,7 +3200,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SQL_SERVER_USER' && $diff->{ SQL_SERVER_USER })) { @@ -3209,7 +3209,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SQL_DATABASE_NAME' && $diff->{ SQL_DATABASE_NAME })) { @@ -3218,7 +3218,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SQL_SERVER_PASSWORD' && $diff->{ SQL_SERVER_PASSWORD })) { @@ -3227,7 +3227,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SQL_DATABASE_NAME' && $diff->{ SQL_DATABASE_NAME })) { @@ -3236,7 +3236,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LDAP_SERVER_HOST' && $diff->{ LDAP_SERVER_HOST })) { @@ -3245,7 +3245,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LDAP_SERVER_PASSWORD' && $diff->{ LDAP_SERVER_PASSWORD })) { @@ -3254,7 +3254,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LDAP_SEARCH_BASE' && $diff->{ LDAP_SEARCH_BASE })) { @@ -3263,7 +3263,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LDAP_SERVER_BIND' && $diff->{ LDAP_SERVER_BIND })) { @@ -3272,7 +3272,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LDAP_QUERY_FILTER' && $diff->{ LDAP_QUERY_FILTER })) { @@ -3281,7 +3281,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_WHOIS' && $diff->{ USE_WHOIS })) { @@ -3290,7 +3290,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_WHOIS_SERVER' && $diff->{ DEFAULT_WHOIS_SERVER })) { @@ -3299,7 +3299,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'WHOIS_DB' && $diff->{ WHOIS_DB })) { @@ -3308,7 +3308,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'WHOIS_HELP_FILE' && $diff->{ WHOIS_HELP_FILE })) { @@ -3317,7 +3317,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'WHOIS_JCODE_P' && $diff->{ WHOIS_JCODE_P })) { @@ -3326,7 +3326,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CPU_TYPE_MANUFACTURER_OS' && $diff->{ CPU_TYPE_MANUFACTURER_OS })) { @@ -3335,7 +3335,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'STRUCT_SOCKADDR' && $diff->{ STRUCT_SOCKADDR })) { @@ -3344,7 +3344,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCK_SH' && $diff->{ LOCK_SH })) { @@ -3353,7 +3353,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCK_EX' && $diff->{ LOCK_EX })) { @@ -3362,7 +3362,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCK_NB' && $diff->{ LOCK_NB })) { @@ -3371,7 +3371,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCK_UN' && $diff->{ LOCK_UN })) { @@ -3380,7 +3380,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'COMPAT_SOLARIS2' && $diff->{ COMPAT_SOLARIS2 })) { @@ -3389,7 +3389,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOT_USE_TIOCNOTTY' && $diff->{ NOT_USE_TIOCNOTTY })) { @@ -3398,7 +3398,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HAS_GETPWUID' && $diff->{ HAS_GETPWUID })) { @@ -3407,7 +3407,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HAS_GETPWGID' && $diff->{ HAS_GETPWGID })) { @@ -3416,7 +3416,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HAS_ALARM' && $diff->{ HAS_ALARM })) { @@ -3425,7 +3425,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'UNISTD' && $diff->{ UNISTD })) { @@ -3434,7 +3434,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SENDMAIL' && $diff->{ SENDMAIL })) { @@ -3443,7 +3443,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TAR' && $diff->{ TAR })) { @@ -3452,7 +3452,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'UUENCODE' && $diff->{ UUENCODE })) { @@ -3461,7 +3461,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'COMPRESS' && $diff->{ COMPRESS })) { @@ -3470,7 +3470,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ZCAT' && $diff->{ ZCAT })) { @@ -3479,7 +3479,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LHA' && $diff->{ LHA })) { @@ -3488,7 +3488,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ISH' && $diff->{ ISH })) { @@ -3497,7 +3497,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ZIP' && $diff->{ ZIP })) { @@ -3506,7 +3506,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'BZIP2' && $diff->{ BZIP2 })) { @@ -3515,7 +3515,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PGP' && $diff->{ PGP })) { @@ -3524,7 +3524,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PGP5' && $diff->{ PGP5 })) { @@ -3533,7 +3533,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PGPE' && $diff->{ PGPE })) { @@ -3542,7 +3542,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PGPK' && $diff->{ PGPK })) { @@ -3551,7 +3551,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PGPS' && $diff->{ PGPS })) { @@ -3560,7 +3560,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PGPV' && $diff->{ PGPV })) { @@ -3569,7 +3569,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'GPG' && $diff->{ GPG })) { @@ -3578,7 +3578,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RCS' && $diff->{ RCS })) { @@ -3587,7 +3587,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CI' && $diff->{ CI })) { @@ -3596,7 +3596,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'BASE64_DECODE' && $diff->{ BASE64_DECODE })) { @@ -3605,7 +3605,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'BASE64_ENCODE' && $diff->{ BASE64_ENCODE })) { @@ -3614,7 +3614,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MD5' && $diff->{ MD5 })) { @@ -3623,7 +3623,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SMTPLOG' && $diff->{ SMTPLOG })) { @@ -3632,7 +3632,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PROHIBIT_COMMAND_FOR_STRANGER' && $diff->{ PROHIBIT_COMMAND_FOR_STRANGER })) { @@ -3641,7 +3641,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_LIBMIME' && $diff->{ USE_LIBMIME })) { @@ -3650,7 +3650,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_LIBMIME' && $diff->{ USE_LIBMIME })) { @@ -3659,7 +3659,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIBMIMEDIR' && $diff->{ LIBMIMEDIR })) { @@ -3668,7 +3668,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RPG_ML_FORM_FLAG' && $diff->{ RPG_ML_FORM_FLAG })) { @@ -3677,7 +3677,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RPG_ML_FORM_FLAG' && $diff->{ RPG_ML_FORM_FLAG })) { @@ -3686,7 +3686,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUN_OS_413' && $diff->{ SUN_OS_413 })) { @@ -3695,7 +3695,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUN_OS_413' && $diff->{ SUN_OS_413 })) { @@ -3704,7 +3704,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUBJECT_HML_FORM' && $diff->{ SUBJECT_HML_FORM })) { @@ -3713,7 +3713,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HML_FORM_LONG_ID' && $diff->{ HML_FORM_LONG_ID })) { @@ -3722,7 +3722,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ML_MEMBER_CHECK' && $diff->{ ML_MEMBER_CHECK })) { @@ -3731,7 +3731,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_HTTP_PORT' && $diff->{ DEFAULT_HTTP_PORT })) { @@ -3740,7 +3740,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_GOPHER_PORT' && $diff->{ DEFAULT_GOPHER_PORT })) { @@ -3749,7 +3749,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_HTML_FIELD' && $diff->{ DEFAULT_HTML_FIELD })) { @@ -3758,7 +3758,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CP' && $diff->{ CP })) { @@ -3767,7 +3767,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RM' && $diff->{ RM })) { @@ -3776,7 +3776,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FML' && $diff->{ FML })) { @@ -3785,7 +3785,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOAD_LIBRARY' && $diff->{ LOAD_LIBRARY })) { @@ -3794,7 +3794,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'STORED_BOUNDARY' && $diff->{ STORED_BOUNDARY })) { @@ -3803,7 +3803,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AGAINST_NIFTY' && $diff->{ AGAINST_NIFTY })) { @@ -3812,7 +3812,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq '_Ds' && $diff->{ _Ds })) { @@ -3821,7 +3821,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq '_Dm' && $diff->{ _Dm })) { @@ -3830,7 +3830,7 @@ sub translate } } return $s if defined $s; - + return ''; diff --git a/fml/lib/FML/Merge/FML4/config_ph.pm b/fml/lib/FML/Merge/FML4/config_ph.pm index 1b0923b8..219051a9 100644 --- a/fml/lib/FML/Merge/FML4/config_ph.pm +++ b/fml/lib/FML/Merge/FML4/config_ph.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: config_ph.pm,v 1.24 2006/04/30 07:02:25 fukachan Exp $ +# $FML: config_ph.pm,v 1.25 2006/05/17 12:23:54 fukachan Exp $ # package FML::Merge::FML4::config_ph; @@ -423,7 +423,7 @@ sub translate_xxx my $host = $diff->{ 'HOST' } || '127.0.0.1'; my $port = $diff->{ 'PORT' } || 25; $host = $host eq '___nil___' ? '127.00.1' : $host; - $port = $port eq '___nil___' ? 25 : $port; + $port = $port eq '___nil___' ? 25 : $port; return "smtp_servers = $host:$port"; } elsif ($key eq 'SPOOL_DIR' || $key eq 'TMP_DIR') { @@ -534,25 +534,25 @@ sub translate_xxx $v =~ s/X-ML-Name:\s+//g; $s .= sprintf("outgoing_mail_header_x_ml_name = %s\n\n", $v); - return $s; + return $s; } elsif ($key eq 'LOGFILE_SUFFIX') { if ($diff->{ LOGFILE }) { my $old = $config->{ LOGFILE }; my $log = $self->_fix_path($config, $diff, "LOGFILE", $old); my $s = sprintf("log_file = %s%s\n\n", $log, $value); - return $s; + return $s; } else { my $s = sprintf("log_file = \$ml_home_dir/log%s\n\n", $value); - return $s; + return $s; } } elsif ($key eq 'MAX_MEMBER_LIMIT') { my $s = ''; $s .= sprintf("use_recipient_total_limit = yes\n\n"); $s .= sprintf("recipient_total_limit = %d\n\n", $value); - return $s; + return $s; } return '# ***ERROR*** UNKNOWN TRANSLATION RULE'; diff --git a/fml/lib/FML/Process/Command.pm b/fml/lib/FML/Process/Command.pm index 75ae63b3..0c47e299 100644 --- a/fml/lib/FML/Process/Command.pm +++ b/fml/lib/FML/Process/Command.pm @@ -3,7 +3,7 @@ # Copyright (C) 2000,2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Command.pm,v 1.119 2006/04/10 13:13:56 fukachan Exp $ +# $FML: Command.pm,v 1.120 2006/06/25 11:05:12 fukachan Exp $ # package FML::Process::Command; @@ -314,7 +314,7 @@ sub _command_process_loop } # XXX analyze the input command and set the result into $context. - # XXX-TODO: command_context_init() checks irregular condition, + # XXX-TODO: command_context_init() checks irregular condition, # XXX-TODO: provided by FML::Command::Irregular::* classes, too. # XXX-TODO: hmm, we call irregular checks for each line ??? $context = $curproc->command_context_init($orig_command); @@ -571,7 +571,7 @@ sub _check_effective_command_contained { my ($curproc) = @_; - # if no effective command, + # if no effective command, # ignore or reply warning determined by matched rule. unless ($num_processed) { my $rule = $curproc->restriction_state_get_ignore_reason() || ''; diff --git a/fml/lib/FML/Process/CreateOnPost.pm b/fml/lib/FML/Process/CreateOnPost.pm index 25684e01..6e719846 100644 --- a/fml/lib/FML/Process/CreateOnPost.pm +++ b/fml/lib/FML/Process/CreateOnPost.pm @@ -3,7 +3,7 @@ # Copyright (C) 2006 Ken'ichi Fukamachi # All rights reserved. # -# $FML: CreateOnPost.pm,v 1.2 2006/02/05 01:02:52 fukachan Exp $ +# $FML: CreateOnPost.pm,v 1.3 2006/02/05 02:45:07 fukachan Exp $ # package FML::Process::CreateOnPost; @@ -243,7 +243,7 @@ sub _createonpost_verify_request # 1. parse To: and Cc: my ($all, $address2class, $class2address) = $curproc->_classify_address(); my $r_args = { - address_to_class => $address2class, + address_to_class => $address2class, class_to_address => $class2address, }; @@ -253,7 +253,7 @@ sub _createonpost_verify_request my $cred = $curproc->credential(); my $sender = $cred->sender(); - # 2. check sender. + # 2. check sender. $r_args->{ address_list } = [ $return_path, $sender ]; $restriction = 'createonpost_sender_restrictions'; $addrlist = $curproc->_apply_restrictions($restriction, $r_args); @@ -372,7 +372,7 @@ sub _apply_restrictions } -# Descriptions: create-on-post main dispatcher. +# Descriptions: create-on-post main dispatcher. # Arguments: OBJ($curproc) # Side Effects: none # Return Value: none @@ -389,7 +389,7 @@ sub _run_createonpost my (@deny_list) = @{ $addr_list->{ "deny" } || [] }; my (@permit_list) = @{ $addr_list->{ "permit" } || [] }; - # 1. + # 1. my $cop_list= $class_to_address->{ $ADDR_CREATE_ON_POST } || []; for my $ml (@$cop_list) { if ($curproc->_is_ml_address($ml)) { @@ -406,7 +406,7 @@ sub _run_createonpost for my $addr (@permit_list) { for my $ign (@deny_list) { if ($addr eq $ign) { - $curproc->log("ignore $addr"); + $curproc->log("ignore $addr"); next ADDR; } } @@ -493,12 +493,12 @@ sub _distribute_ml =head1 FAULT HANDLING -=head2 ML VALIDATION FAULT +=head2 ML VALIDATION FAULT This process checks the ML existence and call fault handler if not found. The fault handler creates a ML. -=head2 ADDRESS VALIDATION FAULT +=head2 ADDRESS VALIDATION FAULT This process does not handle address fault that the specified address is not a member. Instead the executed process e.g. distirubition @@ -507,7 +507,7 @@ process handles it as address validation fault. =cut -# Descriptions: create ml. +# Descriptions: create ml. # Arguments: OBJ($curproc) STR($ml_addr) # Side Effects: none # Return Value: none diff --git a/fml/lib/FML/Process/Distribute.pm b/fml/lib/FML/Process/Distribute.pm index 274ddd72..0deec9a2 100644 --- a/fml/lib/FML/Process/Distribute.pm +++ b/fml/lib/FML/Process/Distribute.pm @@ -3,7 +3,7 @@ # Copyright (C) 2000,2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Distribute.pm,v 1.177 2006/05/03 07:42:37 fukachan Exp $ +# $FML: Distribute.pm,v 1.178 2006/05/04 05:19:37 fukachan Exp $ # package FML::Process::Distribute; @@ -615,7 +615,7 @@ sub _deliver_article my $fp_log_info = sub { $curproc->log(@_);}; my $fp_log_error = sub { $curproc->logerror(@_);}; my $fp_log_debug = sub { $curproc->logdebug(@_);}; - my $fp_smtplog = sub { + my $fp_smtplog = sub { my ($s) = @_; print $s; print "\n" if $s !~ /\n$/o; }; my $handle = undef; @@ -637,7 +637,7 @@ sub _deliver_article # address validater my $validater = sub { - my ($address) = @_; + my ($address) = @_; use FML::Restriction::Base; my $restriction = new FML::Restriction::Base; return $restriction->regexp_match( 'address', $address ); @@ -689,7 +689,7 @@ sub _deliver_article map_params => $config, - queue => $queue, + queue => $queue, # fallback use_queue_dir => 1, @@ -703,7 +703,7 @@ sub _deliver_article } # delivery not completes. - if ($service->get_not_done()) { + if ($service->get_not_done()) { $curproc->logdebug("delivery not done but must fallback, ok"); } diff --git a/fml/lib/FML/Process/Kernel.pm b/fml/lib/FML/Process/Kernel.pm index 56553981..caefca3b 100644 --- a/fml/lib/FML/Process/Kernel.pm +++ b/fml/lib/FML/Process/Kernel.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: Kernel.pm,v 1.283 2006/05/12 13:50:11 fukachan Exp $ +# $FML: Kernel.pm,v 1.284 2006/05/13 11:45:40 fukachan Exp $ # package FML::Process::Kernel; @@ -2362,7 +2362,7 @@ sub reply_message_delete push(@$queue_fixed, $q); } - + $pcb->set($category, $class, $queue_fixed); } diff --git a/fml/lib/FML/Process/Project.pm b/fml/lib/FML/Process/Project.pm index cafe7bff..fae7f178 100644 --- a/fml/lib/FML/Process/Project.pm +++ b/fml/lib/FML/Process/Project.pm @@ -3,7 +3,7 @@ # Copyright (C) 2006 Ken'ichi Fukamachi # All rights reserved. # -# $FML$ +# $FML: Project.pm,v 1.1 2006/02/01 12:35:45 fukachan Exp $ # package FML::Process::Project; @@ -135,7 +135,7 @@ sub run $proj->print_as_html_table(); } elsif (defined $option->{ csv }) { - $proj->print_as_csv(); + $proj->print_as_csv(); } else { $proj->print_as_csv(); diff --git a/fml/lib/FML/Process/Utils.pm b/fml/lib/FML/Process/Utils.pm index f74c6f90..69189f54 100644 --- a/fml/lib/FML/Process/Utils.pm +++ b/fml/lib/FML/Process/Utils.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: Utils.pm,v 1.149 2006/04/22 08:29:23 fukachan Exp $ +# $FML: Utils.pm,v 1.150 2006/05/13 11:45:40 fukachan Exp $ # package FML::Process::Utils; @@ -1715,7 +1715,7 @@ sub is_fml8_managed_address { my ($curproc, $address) = @_; my ($ml_name, $ml_domain) = split(/\@/, $address); - + return $curproc->is_config_cf_exist($ml_name, $ml_domain); } @@ -2265,7 +2265,7 @@ sub context_switch_get_context my ($curproc) = @_; my $config = $curproc->config(); my $config_saved = $config->get_context(); - my $pcb = $curproc->pcb(); + my $pcb = $curproc->pcb(); my $pcb_saved = $pcb->get_context(); my $process_title = $curproc->get_process_title(); my $context = { @@ -2287,7 +2287,7 @@ sub context_switch_set_context my ($curproc, $context)= @_; my $config = $curproc->config(); my $config_context = $context->{ config_saved_context }; - my $pcb = $curproc->pcb(); + my $pcb = $curproc->pcb(); my $pcb_context = $context->{ pcb_saved_context }; my $process_title = $context->{ process_title }; diff --git a/fml/lib/FML/Restriction/CreateOnPost.pm b/fml/lib/FML/Restriction/CreateOnPost.pm index 2dedfd85..00775f1c 100644 --- a/fml/lib/FML/Restriction/CreateOnPost.pm +++ b/fml/lib/FML/Restriction/CreateOnPost.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: CreateOnPost.pm,v 1.1 2006/02/04 08:00:09 fukachan Exp $ +# $FML: CreateOnPost.pm,v 1.2 2006/02/05 02:44:25 fukachan Exp $ # package FML::Restriction::CreateOnPost; @@ -40,7 +40,7 @@ sub new } -# Descriptions: +# Descriptions: # Arguments: OBJ($self) STR($rule) STR($sender) # Side Effects: none # Return Value: ARRAY(STR, STR) @@ -56,7 +56,7 @@ sub reject_errormail } -# Descriptions: +# Descriptions: # Arguments: OBJ($self) STR($rule) STR($sender) # Side Effects: none # Return Value: ARRAY(STR, STR) @@ -73,7 +73,7 @@ sub reject_fml8_managed_address } -# Descriptions: +# Descriptions: # Arguments: OBJ($self) STR($rule) STR($sender) # Side Effects: none # Return Value: ARRAY(STR, STR) @@ -91,7 +91,7 @@ sub reject_createonpost_domain } -# Descriptions: +# Descriptions: # Arguments: OBJ($self) STR($rule) STR($sender) # Side Effects: none # Return Value: ARRAY(STR, STR) diff --git a/fml/lib/FML/User/DB.pm b/fml/lib/FML/User/DB.pm index d4af39b5..bb7bb807 100644 --- a/fml/lib/FML/User/DB.pm +++ b/fml/lib/FML/User/DB.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: DB.pm,v 1.10 2006/02/18 09:25:32 fukachan Exp $ +# $FML: DB.pm,v 1.11 2006/02/22 12:18:52 fukachan Exp $ # package FML::User::DB; @@ -113,7 +113,7 @@ sub set } -# Descriptions: find the first matched entry { $key => $value } +# Descriptions: find the first matched entry { $key => $value } # in $primary_user_db_${class}_map. # Arguments: OBJ($self) STR($class) STR($key) # Side Effects: update database |