diff options
| author | fukachan <fukachan> | 2006-01-09 14:00:53 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2006-01-09 14:00:53 +0000 |
| commit | 998d6457399e07b82ee606d2cff85a3261fd6743 (patch) | |
| tree | 446fe1c910bfc9243914fb7ecc4ed0337bb37eed /fml/lib/FML/Merge | |
| parent | 7e1d1a36de7bb1d42262bcf5573a52b56fe22804 (diff) | |
| download | fml8-998d6457399e07b82ee606d2cff85a3261fd6743.tar.gz fml8-998d6457399e07b82ee606d2cff85a3261fd6743.tar.bz2 fml8-998d6457399e07b82ee606d2cff85a3261fd6743.zip | |
white space cosmetics.
fix copyright.
Diffstat (limited to 'fml/lib/FML/Merge')
| -rw-r--r-- | fml/lib/FML/Merge/FML4/Rules.pm | 838 | ||||
| -rw-r--r-- | fml/lib/FML/Merge/FML4/config_ph.pm | 38 |
2 files changed, 438 insertions, 438 deletions
diff --git a/fml/lib/FML/Merge/FML4/Rules.pm b/fml/lib/FML/Merge/FML4/Rules.pm index d6f2575f..3d5ea5d5 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.9 2006/01/04 07:48:01 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 'PERMIT_POST_FROM' && $diff->{ PERMIT_POST_FROM }) || ($key eq 'REJECT_POST_HANDLER' && $diff->{ REJECT_POST_HANDLER })) { @@ -138,7 +138,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_POST_FROM' && $diff->{ PERMIT_POST_FROM }) || ($key eq 'REJECT_POST_HANDLER' && $diff->{ REJECT_POST_HANDLER })) { @@ -149,7 +149,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_POST_FROM' && $diff->{ PERMIT_POST_FROM }) || ($key eq 'REJECT_POST_HANDLER' && $diff->{ REJECT_POST_HANDLER })) { @@ -160,7 +160,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_POST_FROM' && $diff->{ PERMIT_POST_FROM }) || ($key eq 'MODERATOR_FORWARD_TYPE' && $diff->{ MODERATOR_FORWARD_TYPE })) { @@ -171,7 +171,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_POST_FROM' && $diff->{ PERMIT_POST_FROM }) || ($key eq 'MODERATOR_FORWARD_TYPE' && $diff->{ MODERATOR_FORWARD_TYPE })) { @@ -182,7 +182,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_POST_FROM' && $diff->{ PERMIT_POST_FROM }) || ($key eq 'MODERATOR_FORWARD_TYPE' && $diff->{ MODERATOR_FORWARD_TYPE })) { @@ -193,7 +193,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONTROL_ADDRESS' && $diff->{ CONTROL_ADDRESS })) { @@ -202,7 +202,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_COMMAND_FROM' && $diff->{ PERMIT_COMMAND_FROM })) { @@ -211,7 +211,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_COMMAND_FROM' && $diff->{ PERMIT_COMMAND_FROM }) || ($key eq 'REJECT_COMMAND_HANDLER' && $diff->{ REJECT_COMMAND_HANDLER })) { @@ -222,7 +222,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_COMMAND_FROM' && $diff->{ PERMIT_COMMAND_FROM }) || ($key eq 'REJECT_COMMAND_HANDLER' && $diff->{ REJECT_COMMAND_HANDLER })) { @@ -233,7 +233,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_COMMAND_FROM' && $diff->{ PERMIT_COMMAND_FROM }) || ($key eq 'REJECT_COMMAND_HANDLER' && $diff->{ REJECT_COMMAND_HANDLER })) { @@ -244,7 +244,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_COMMAND_FROM' && $diff->{ PERMIT_COMMAND_FROM })) { @@ -253,7 +253,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAIL_LIST_ACCEPT_COMMAND' && $diff->{ MAIL_LIST_ACCEPT_COMMAND })) { @@ -262,7 +262,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAINTAINER' && $diff->{ MAINTAINER })) { @@ -271,7 +271,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAINTAINER_SIGNATURE' && $diff->{ MAINTAINER_SIGNATURE })) { @@ -280,7 +280,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ML_FN' && $diff->{ ML_FN })) { @@ -289,7 +289,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SPOOL_DIR' && $diff->{ SPOOL_DIR })) { @@ -298,7 +298,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TMP_DIR' && $diff->{ TMP_DIR })) { @@ -307,7 +307,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'VAR_DIR' && $diff->{ VAR_DIR })) { @@ -316,7 +316,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'VARLOG_DIR' && $diff->{ VARLOG_DIR })) { @@ -325,7 +325,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'VARRUN_DIR' && $diff->{ VARRUN_DIR })) { @@ -334,7 +334,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'VARDB_DIR' && $diff->{ VARDB_DIR })) { @@ -343,7 +343,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MANUAL_REGISTRATION_TYPE' && $diff->{ MANUAL_REGISTRATION_TYPE })) { @@ -352,7 +352,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MANUAL_REGISTRATION_TYPE' && $diff->{ MANUAL_REGISTRATION_TYPE })) { @@ -361,7 +361,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MANUAL_REGISTRATION_CONFIRMATION_FILE' && $diff->{ MANUAL_REGISTRATION_CONFIRMATION_FILE })) { @@ -370,7 +370,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_TYPE' && $diff->{ AUTO_REGISTRATION_TYPE })) { @@ -379,7 +379,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_TYPE' && $diff->{ AUTO_REGISTRATION_TYPE })) { @@ -388,7 +388,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_TYPE' && $diff->{ AUTO_REGISTRATION_TYPE })) { @@ -397,7 +397,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_TYPE' && $diff->{ AUTO_REGISTRATION_TYPE })) { @@ -406,7 +406,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_KEYWORD' && $diff->{ AUTO_REGISTRATION_KEYWORD })) { @@ -415,7 +415,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_KEYWORD' && $diff->{ AUTO_REGISTRATION_KEYWORD })) { @@ -424,7 +424,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_DEFAULT_MODE' && $diff->{ AUTO_REGISTRATION_DEFAULT_MODE })) { @@ -433,7 +433,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_ADDRESS' && $diff->{ CONFIRMATION_ADDRESS })) { @@ -442,7 +442,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_ADDRESS' && $diff->{ CONFIRMATION_ADDRESS })) { @@ -451,7 +451,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_SUBSCRIBE' && $diff->{ CONFIRMATION_SUBSCRIBE })) { @@ -460,7 +460,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_SUBSCRIBE' && $diff->{ CONFIRMATION_SUBSCRIBE })) { @@ -469,7 +469,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_KEYWORD' && $diff->{ CONFIRMATION_KEYWORD })) { @@ -478,7 +478,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_KEYWORD' && $diff->{ CONFIRMATION_KEYWORD })) { @@ -487,7 +487,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_WELCOME_STATEMENT' && $diff->{ CONFIRMATION_WELCOME_STATEMENT })) { @@ -496,7 +496,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_SUBSCRIBE_NEED_YOUR_NAME' && $diff->{ CONFIRMATION_SUBSCRIBE_NEED_YOUR_NAME })) { @@ -505,7 +505,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_FILE' && $diff->{ CONFIRMATION_FILE })) { @@ -514,7 +514,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_EXPIRE' && $diff->{ CONFIRMATION_EXPIRE })) { @@ -523,7 +523,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_LIST' && $diff->{ CONFIRMATION_LIST })) { @@ -532,7 +532,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_SUBSCRIBE' && $diff->{ DEFAULT_SUBSCRIBE })) { @@ -541,7 +541,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_SUBSCRIBE' && $diff->{ DEFAULT_SUBSCRIBE })) { @@ -550,7 +550,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'WELCOME_FILE' && $diff->{ WELCOME_FILE })) { @@ -559,7 +559,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'WELCOME_STATEMENT' && $diff->{ WELCOME_STATEMENT })) { @@ -568,7 +568,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILE_TO_REGIST' && $diff->{ FILE_TO_REGIST })) { @@ -577,7 +577,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTERED_UNDELIVER_P' && $diff->{ AUTO_REGISTERED_UNDELIVER_P })) { @@ -586,7 +586,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTERED_UNDELIVER_P' && $diff->{ AUTO_REGISTERED_UNDELIVER_P })) { @@ -595,7 +595,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTERD_UNDELIVER_P' && $diff->{ AUTO_REGISTERD_UNDELIVER_P })) { @@ -604,7 +604,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_LINES_LIMIT' && $diff->{ AUTO_REGISTRATION_LINES_LIMIT })) { @@ -613,7 +613,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_LINES_LIMIT' && $diff->{ AUTO_REGISTRATION_LINES_LIMIT })) { @@ -622,7 +622,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMD_ACK_REQ_FILE' && $diff->{ CONFIRMD_ACK_REQ_FILE })) { @@ -631,7 +631,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMD_ACK_LOGFILE' && $diff->{ CONFIRMD_ACK_LOGFILE })) { @@ -640,7 +640,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMD_ACK_EXPIRE_UNIT' && $diff->{ CONFIRMD_ACK_EXPIRE_UNIT })) { @@ -649,7 +649,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMD_ACK_WAIT_UNIT' && $diff->{ CONFIRMD_ACK_WAIT_UNIT })) { @@ -658,7 +658,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION' && $diff->{ REMOTE_ADMINISTRATION })) { @@ -667,7 +667,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION' && $diff->{ REMOTE_ADMINISTRATION })) { @@ -676,7 +676,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_REQUIRE_PASSWORD' && $diff->{ REMOTE_ADMINISTRATION_REQUIRE_PASSWORD })) { @@ -685,7 +685,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_AUTH_TYPE' && $diff->{ REMOTE_ADMINISTRATION_AUTH_TYPE })) { @@ -694,7 +694,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_AUTH_TYPE' && $diff->{ REMOTE_ADMINISTRATION_AUTH_TYPE })) { @@ -703,7 +703,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_AUTH_TYPE' && $diff->{ REMOTE_ADMINISTRATION_AUTH_TYPE })) { @@ -712,7 +712,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_AUTH_TYPE' && $diff->{ REMOTE_ADMINISTRATION_AUTH_TYPE })) { @@ -721,7 +721,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_AUTH_TYPE' && $diff->{ REMOTE_ADMINISTRATION_AUTH_TYPE })) { @@ -730,7 +730,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_AUTH_TYPE' && $diff->{ REMOTE_ADMINISTRATION_AUTH_TYPE })) { @@ -739,7 +739,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_AUTH_TYPE' && $diff->{ REMOTE_ADMINISTRATION_AUTH_TYPE })) { @@ -748,7 +748,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_MEMBER_LIST' && $diff->{ ADMIN_MEMBER_LIST })) { @@ -757,7 +757,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_HELP_FILE' && $diff->{ ADMIN_HELP_FILE })) { @@ -766,7 +766,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PASSWD_FILE' && $diff->{ PASSWD_FILE })) { @@ -775,7 +775,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_ADD_SEND_WELCOME_FILE' && $diff->{ ADMIN_ADD_SEND_WELCOME_FILE })) { @@ -784,7 +784,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_ADD_SEND_WELCOME_FILE' && $diff->{ ADMIN_ADD_SEND_WELCOME_FILE })) { @@ -793,7 +793,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_LOG_DEFAULT_LINE_LIMIT' && $diff->{ ADMIN_LOG_DEFAULT_LINE_LIMIT })) { @@ -802,7 +802,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PGP_PATH' && $diff->{ PGP_PATH })) { @@ -811,7 +811,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_FML40_PGP_PATH' && $diff->{ USE_FML40_PGP_PATH })) { @@ -820,7 +820,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DIST_AUTH_KEYRING_DIR' && $diff->{ DIST_AUTH_KEYRING_DIR })) { @@ -829,7 +829,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DIST_ENCRYPT_KEYRING_DIR' && $diff->{ DIST_ENCRYPT_KEYRING_DIR })) { @@ -838,7 +838,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_AUTH_KEYRING_DIR' && $diff->{ ADMIN_AUTH_KEYRING_DIR })) { @@ -847,7 +847,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_ENCRYPT_KEYRING_DIR' && $diff->{ ADMIN_ENCRYPT_KEYRING_DIR })) { @@ -856,7 +856,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MODERATOR_MEMBER_LIST' && $diff->{ MODERATOR_MEMBER_LIST })) { @@ -865,7 +865,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MODERATOR_EXPIRE_LIMIT' && $diff->{ MODERATOR_EXPIRE_LIMIT })) { @@ -874,7 +874,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REJECT_ADDR' && $diff->{ REJECT_ADDR })) { @@ -883,7 +883,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REJECT_ADDR_LIST' && $diff->{ REJECT_ADDR_LIST })) { @@ -892,7 +892,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 })) { @@ -901,7 +901,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 })) { @@ -910,7 +910,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CHECK_MESSAGE_ID' && $diff->{ CHECK_MESSAGE_ID })) { @@ -919,7 +919,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CHECK_MESSAGE_ID' && $diff->{ CHECK_MESSAGE_ID })) { @@ -928,7 +928,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CHECK_MAILBODY_CKSUM' && $diff->{ CHECK_MAILBODY_CKSUM })) { @@ -937,7 +937,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOG_CONNECTION' && $diff->{ LOG_CONNECTION })) { @@ -946,7 +946,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADDR_CHECK_MAX' && $diff->{ ADDR_CHECK_MAX })) { @@ -955,7 +955,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADDR_CHECK_MAX' && $diff->{ ADDR_CHECK_MAX })) { @@ -964,7 +964,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'INCOMING_MAIL_SIZE_LIMIT' && $diff->{ INCOMING_MAIL_SIZE_LIMIT })) { @@ -973,7 +973,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'INCOMING_MAIL_SIZE_LIMIT' && $diff->{ INCOMING_MAIL_SIZE_LIMIT })) { @@ -982,7 +982,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOTIFY_MAIL_SIZE_OVERFLOW' && $diff->{ NOTIFY_MAIL_SIZE_OVERFLOW })) { @@ -991,7 +991,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOTIFY_MAIL_SIZE_OVERFLOW' && $diff->{ NOTIFY_MAIL_SIZE_OVERFLOW })) { @@ -1000,7 +1000,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ANNOUNCE_MAIL_SIZE_OVERFLOW' && $diff->{ ANNOUNCE_MAIL_SIZE_OVERFLOW })) { @@ -1009,7 +1009,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ANNOUNCE_MAIL_SIZE_OVERFLOW' && $diff->{ ANNOUNCE_MAIL_SIZE_OVERFLOW })) { @@ -1018,7 +1018,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAX_MEMBER_LIMIT' && $diff->{ MAX_MEMBER_LIMIT })) { @@ -1027,7 +1027,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_DISTRIBUTE_FILTER' && $diff->{ USE_DISTRIBUTE_FILTER })) { @@ -1036,7 +1036,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_DISTRIBUTE_FILTER' && $diff->{ USE_DISTRIBUTE_FILTER })) { @@ -1045,7 +1045,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DISTRIBUTE_FILTER_HOOK' && $diff->{ DISTRIBUTE_FILTER_HOOK })) { @@ -1054,7 +1054,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_NOTIFY_REJECTION' && $diff->{ FILTER_NOTIFY_REJECTION })) { @@ -1063,7 +1063,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_NOTIFY_REJECTION' && $diff->{ FILTER_NOTIFY_REJECTION })) { @@ -1072,7 +1072,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_NULL_BODY' && $diff->{ FILTER_ATTR_REJECT_NULL_BODY })) { @@ -1081,7 +1081,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_NULL_BODY' && $diff->{ FILTER_ATTR_REJECT_NULL_BODY })) { @@ -1090,7 +1090,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_COMMAND' && $diff->{ FILTER_ATTR_REJECT_COMMAND })) { @@ -1099,7 +1099,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_COMMAND' && $diff->{ FILTER_ATTR_REJECT_COMMAND })) { @@ -1108,7 +1108,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_2BYTES_COMMAND' && $diff->{ FILTER_ATTR_REJECT_2BYTES_COMMAND })) { @@ -1117,7 +1117,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_2BYTES_COMMAND' && $diff->{ FILTER_ATTR_REJECT_2BYTES_COMMAND })) { @@ -1126,7 +1126,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_INVALID_COMMAND' && $diff->{ FILTER_ATTR_REJECT_INVALID_COMMAND })) { @@ -1135,7 +1135,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_INVALID_COMMAND' && $diff->{ FILTER_ATTR_REJECT_INVALID_COMMAND })) { @@ -1144,7 +1144,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 })) { @@ -1153,7 +1153,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 })) { @@ -1162,7 +1162,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_MS_GUID' && $diff->{ FILTER_ATTR_REJECT_MS_GUID })) { @@ -1171,7 +1171,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_MS_GUID' && $diff->{ FILTER_ATTR_REJECT_MS_GUID })) { @@ -1180,7 +1180,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_INVALID_JAPANESE' && $diff->{ FILTER_ATTR_REJECT_INVALID_JAPANESE })) { @@ -1189,7 +1189,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_INVALID_JAPANESE' && $diff->{ FILTER_ATTR_REJECT_INVALID_JAPANESE })) { @@ -1198,7 +1198,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONTENT_HANDLER_CUTOFF_EMPTY_MESSAGE' && $diff->{ CONTENT_HANDLER_CUTOFF_EMPTY_MESSAGE })) { @@ -1207,7 +1207,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONTENT_HANDLER_REJECT_EMPTY_MESSAGE' && $diff->{ CONTENT_HANDLER_REJECT_EMPTY_MESSAGE })) { @@ -1216,7 +1216,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_HANKAKU_CONVERTER' && $diff->{ USE_HANKAKU_CONVERTER })) { @@ -1225,7 +1225,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_HANKAKU_CONVERTER' && $diff->{ USE_HANKAKU_CONVERTER })) { @@ -1234,7 +1234,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_MAIL_DEFAULT_HANDLER' && $diff->{ HTML_MAIL_DEFAULT_HANDLER })) { @@ -1243,7 +1243,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_MTI' && $diff->{ USE_MTI })) { @@ -1252,7 +1252,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MTI_WARN_INTERVAL' && $diff->{ MTI_WARN_INTERVAL })) { @@ -1261,7 +1261,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MTI_WARN_LASTLOG' && $diff->{ MTI_WARN_LASTLOG })) { @@ -1270,7 +1270,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 })) { @@ -1281,7 +1281,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MTI_BURST_HARD_LIMIT' && $diff->{ MTI_BURST_HARD_LIMIT })) { @@ -1290,7 +1290,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MTI_COST_EVAL_FUNCTION' && $diff->{ MTI_COST_EVAL_FUNCTION })) { @@ -1299,7 +1299,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MTI_MAIL_FROM_HINT_LIST' && $diff->{ MTI_MAIL_FROM_HINT_LIST })) { @@ -1308,7 +1308,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUBSCRIBE_ANNOUNCE_FORWARD_TYPE' && $diff->{ SUBSCRIBE_ANNOUNCE_FORWARD_TYPE })) { @@ -1317,7 +1317,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUBSCRIBE_ANNOUNCE_FORWARD_TYPE' && $diff->{ SUBSCRIBE_ANNOUNCE_FORWARD_TYPE })) { @@ -1326,7 +1326,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'UNSUBSCRIBE_AUTH_TYPE' && $diff->{ UNSUBSCRIBE_AUTH_TYPE })) { @@ -1335,7 +1335,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'UNSUBSCRIBE_AUTH_TYPE' && $diff->{ UNSUBSCRIBE_AUTH_TYPE })) { @@ -1344,7 +1344,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CHADDR_AUTH_TYPE' && $diff->{ CHADDR_AUTH_TYPE })) { @@ -1353,7 +1353,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CHADDR_AUTH_TYPE' && $diff->{ CHADDR_AUTH_TYPE })) { @@ -1362,7 +1362,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_LOG_MAIL' && $diff->{ USE_LOG_MAIL })) { @@ -1371,7 +1371,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_LOG_MAIL' && $diff->{ USE_LOG_MAIL })) { @@ -1380,7 +1380,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOG_MAIL_DIR' && $diff->{ LOG_MAIL_DIR })) { @@ -1389,7 +1389,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOG_MAIL_SEQ' && $diff->{ LOG_MAIL_SEQ })) { @@ -1398,7 +1398,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NUM_LOG_MAIL' && $diff->{ NUM_LOG_MAIL })) { @@ -1407,7 +1407,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOG_MAIL_FILE_SIZE_MAX' && $diff->{ LOG_MAIL_FILE_SIZE_MAX })) { @@ -1416,7 +1416,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_ENCRYPTED_DISTRIBUTION' && $diff->{ USE_ENCRYPTED_DISTRIBUTION })) { @@ -1425,7 +1425,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ENCRYPTED_DISTRIBUTION_TYPE' && $diff->{ ENCRYPTED_DISTRIBUTION_TYPE })) { @@ -1434,7 +1434,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DATE_TYPE' && $diff->{ DATE_TYPE })) { @@ -1443,7 +1443,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DATE_TYPE' && $diff->{ DATE_TYPE })) { @@ -1452,7 +1452,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'XMLNAME' && $diff->{ XMLNAME })) { @@ -1461,7 +1461,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'XMLCOUNT' && $diff->{ XMLCOUNT })) { @@ -1470,7 +1470,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'XMLCOUNT' && $diff->{ XMLCOUNT })) { @@ -1479,7 +1479,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUBJECT_TAG_TYPE' && $diff->{ SUBJECT_TAG_TYPE })) { @@ -1488,7 +1488,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'BRACKET' && $diff->{ BRACKET })) { @@ -1497,7 +1497,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'STRIP_BRACKETS' && $diff->{ STRIP_BRACKETS })) { @@ -1506,7 +1506,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'BRACKET_SEPARATOR' && $diff->{ BRACKET_SEPARATOR })) { @@ -1515,7 +1515,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUBJECT_FREE_FORM' && $diff->{ SUBJECT_FREE_FORM })) { @@ -1524,7 +1524,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUBJECT_FREE_FORM_REGEXP' && $diff->{ SUBJECT_FREE_FORM_REGEXP })) { @@ -1533,7 +1533,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUBJECT_FORM_LONG_ID' && $diff->{ SUBJECT_FORM_LONG_ID })) { @@ -1542,7 +1542,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_ERRORS_TO' && $diff->{ USE_ERRORS_TO })) { @@ -1551,7 +1551,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_ERRORS_TO' && $diff->{ USE_ERRORS_TO })) { @@ -1560,7 +1560,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ERRORS_TO' && $diff->{ ERRORS_TO })) { @@ -1569,7 +1569,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_ORIGINAL_MESSAGE_ID' && $diff->{ USE_ORIGINAL_MESSAGE_ID })) { @@ -1578,7 +1578,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_ORIGINAL_MESSAGE_ID' && $diff->{ USE_ORIGINAL_MESSAGE_ID })) { @@ -1587,7 +1587,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PRECEDENCE' && $diff->{ PRECEDENCE })) { @@ -1596,7 +1596,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PRECEDENCE' && $diff->{ PRECEDENCE })) { @@ -1605,7 +1605,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'APPEND_STARDATE' && $diff->{ APPEND_STARDATE })) { @@ -1614,7 +1614,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'APPEND_STARDATE' && $diff->{ APPEND_STARDATE })) { @@ -1623,7 +1623,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_RFC2369' && $diff->{ USE_RFC2369 })) { @@ -1632,7 +1632,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_RFC2369' && $diff->{ USE_RFC2369 })) { @@ -1641,7 +1641,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIST_SOFTWARE' && $diff->{ LIST_SOFTWARE })) { @@ -1650,7 +1650,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIST_POST' && $diff->{ LIST_POST })) { @@ -1659,7 +1659,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIST_OWNER' && $diff->{ LIST_OWNER })) { @@ -1668,7 +1668,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIST_HELP' && $diff->{ LIST_HELP })) { @@ -1677,7 +1677,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIST_SUBSCRIBE' && $diff->{ LIST_SUBSCRIBE })) { @@ -1686,7 +1686,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIST_UNSUBSCRIBE' && $diff->{ LIST_UNSUBSCRIBE })) { @@ -1695,7 +1695,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIST_ID' && $diff->{ LIST_ID })) { @@ -1704,7 +1704,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REWRITE_TO' && $diff->{ REWRITE_TO })) { @@ -1713,7 +1713,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REWRITE_TO' && $diff->{ REWRITE_TO })) { @@ -1722,7 +1722,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REWRITE_TO' && $diff->{ REWRITE_TO })) { @@ -1731,7 +1731,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'Subject' && $diff->{ Subject })) { @@ -1740,7 +1740,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'From_address' && $diff->{ From_address })) { @@ -1749,7 +1749,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'User' && $diff->{ User })) { @@ -1758,7 +1758,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'Date' && $diff->{ Date })) { @@ -1767,7 +1767,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TZone' && $diff->{ TZone })) { @@ -1776,7 +1776,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TZone' && $diff->{ TZone })) { @@ -1785,7 +1785,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TZONE_DST' && $diff->{ TZONE_DST })) { @@ -1794,7 +1794,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PASS_ALL_FIELDS_IN_HEADER' && $diff->{ PASS_ALL_FIELDS_IN_HEADER })) { @@ -1803,7 +1803,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUPERFLUOUS_HEADERS' && $diff->{ SUPERFLUOUS_HEADERS })) { @@ -1812,7 +1812,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SKIP_FIELDS' && $diff->{ SKIP_FIELDS })) { @@ -1821,7 +1821,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ALLOW_WRONG_LINES_IN_HEADER' && $diff->{ ALLOW_WRONG_LINES_IN_HEADER })) { @@ -1830,7 +1830,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'COMMAND_SYNTAX_EXTENSION' && $diff->{ COMMAND_SYNTAX_EXTENSION })) { @@ -1839,7 +1839,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_SUBJECT_AS_COMMANDS' && $diff->{ USE_SUBJECT_AS_COMMANDS })) { @@ -1848,7 +1848,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_WARNING' && $diff->{ USE_WARNING })) { @@ -1857,7 +1857,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_WARNING' && $diff->{ USE_WARNING })) { @@ -1866,7 +1866,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'COMMAND_ONLY_SERVER' && $diff->{ COMMAND_ONLY_SERVER })) { @@ -1875,7 +1875,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'COMMAND_CHECK_LIMIT' && $diff->{ COMMAND_CHECK_LIMIT })) { @@ -1884,7 +1884,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'GUIDE_CHECK_LIMIT' && $diff->{ GUIDE_CHECK_LIMIT })) { @@ -1893,7 +1893,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'GUIDE_KEYWORD' && $diff->{ GUIDE_KEYWORD })) { @@ -1902,7 +1902,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAXLEN_COMMAND_INPUT' && $diff->{ MAXLEN_COMMAND_INPUT })) { @@ -1911,7 +1911,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAXNUM_COMMAND_INPUT' && $diff->{ MAXNUM_COMMAND_INPUT })) { @@ -1920,7 +1920,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CHADDR_KEYWORD' && $diff->{ CHADDR_KEYWORD })) { @@ -1929,7 +1929,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CHADDR_REPLY_TO' && $diff->{ CHADDR_REPLY_TO })) { @@ -1938,7 +1938,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_CHADDR_REPLY_TO' && $diff->{ ADMIN_CHADDR_REPLY_TO })) { @@ -1947,7 +1947,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MGET_MODE_DEFAULT' && $diff->{ MGET_MODE_DEFAULT })) { @@ -1956,7 +1956,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MGET_TEXT_MODE_DEFAULT' && $diff->{ MGET_TEXT_MODE_DEFAULT })) { @@ -1965,7 +1965,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAIL_LENGTH_LIMIT' && $diff->{ MAIL_LENGTH_LIMIT })) { @@ -1974,7 +1974,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SLEEPTIME' && $diff->{ SLEEPTIME })) { @@ -1983,7 +1983,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_VERSION' && $diff->{ MIME_VERSION })) { @@ -1992,7 +1992,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_CONTENT_TYPE' && $diff->{ MIME_CONTENT_TYPE })) { @@ -2001,7 +2001,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_MULTIPART_BOUNDARY' && $diff->{ MIME_MULTIPART_BOUNDARY })) { @@ -2010,7 +2010,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_MULTIPART_CLOSE_DELIMITER' && $diff->{ MIME_MULTIPART_CLOSE_DELIMITER })) { @@ -2019,7 +2019,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_MULTIPART_DELIMITER' && $diff->{ MIME_MULTIPART_DELIMITER })) { @@ -2028,7 +2028,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_MULTIPART_PREAMBLE' && $diff->{ MIME_MULTIPART_PREAMBLE })) { @@ -2037,7 +2037,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_MULTIPART_TRAILER' && $diff->{ MIME_MULTIPART_TRAILER })) { @@ -2046,7 +2046,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_SJIS_IN_ISH' && $diff->{ USE_SJIS_IN_ISH })) { @@ -2055,7 +2055,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RFC1153_ISSUE' && $diff->{ RFC1153_ISSUE })) { @@ -2064,7 +2064,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RFC1153_VOL' && $diff->{ RFC1153_VOL })) { @@ -2073,7 +2073,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RFC1153_SEQUENCE_FILE' && $diff->{ RFC1153_SEQUENCE_FILE })) { @@ -2082,7 +2082,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_DOT_QMAIL_EXT' && $diff->{ USE_DOT_QMAIL_EXT })) { @@ -2091,7 +2091,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FORCE_COMMAND_REPLY_TO' && $diff->{ FORCE_COMMAND_REPLY_TO })) { @@ -2100,7 +2100,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MGET_SUBJECT_TEMPLATE' && $diff->{ MGET_SUBJECT_TEMPLATE })) { @@ -2109,7 +2109,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MESSAGE_RETURN_ADDR_POLICY' && $diff->{ MESSAGE_RETURN_ADDR_POLICY })) { @@ -2118,7 +2118,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_SUBJECT_TEMPLATE' && $diff->{ MSEND_SUBJECT_TEMPLATE })) { @@ -2127,7 +2127,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_RC' && $diff->{ MSEND_RC })) { @@ -2136,7 +2136,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_MODE_DEFAULT' && $diff->{ MSEND_MODE_DEFAULT })) { @@ -2145,7 +2145,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_DEFAULT_SUBJECT' && $diff->{ MSEND_DEFAULT_SUBJECT })) { @@ -2154,7 +2154,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_NOTIFICATION' && $diff->{ MSEND_NOTIFICATION })) { @@ -2163,7 +2163,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_NOTIFICATION_SUBJECT' && $diff->{ MSEND_NOTIFICATION_SUBJECT })) { @@ -2172,7 +2172,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 })) { @@ -2181,7 +2181,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_NOT_USE_NEWSYSLOG' && $diff->{ MSEND_NOT_USE_NEWSYSLOG })) { @@ -2190,7 +2190,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOG_MESSAGE_ID' && $diff->{ LOG_MESSAGE_ID })) { @@ -2199,7 +2199,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MESSAGE_ID_CACHE_BUFSIZE' && $diff->{ MESSAGE_ID_CACHE_BUFSIZE })) { @@ -2208,7 +2208,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOG_MAILBODY_CKSUM' && $diff->{ LOG_MAILBODY_CKSUM })) { @@ -2217,7 +2217,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MEMBER_LIST' && $diff->{ MEMBER_LIST })) { @@ -2226,7 +2226,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ACTIVE_LIST' && $diff->{ ACTIVE_LIST })) { @@ -2235,7 +2235,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'GUIDE_FILE' && $diff->{ GUIDE_FILE })) { @@ -2244,7 +2244,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'OBJECTIVE_FILE' && $diff->{ OBJECTIVE_FILE })) { @@ -2253,7 +2253,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HELP_FILE' && $diff->{ HELP_FILE })) { @@ -2262,7 +2262,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DENY_FILE' && $diff->{ DENY_FILE })) { @@ -2271,7 +2271,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOGFILE' && $diff->{ LOGFILE })) { @@ -2280,7 +2280,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MGET_LOGFILE' && $diff->{ MGET_LOGFILE })) { @@ -2289,7 +2289,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOGFILE_SUFFIX' && $diff->{ LOGFILE_SUFFIX })) { @@ -2298,7 +2298,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEBUG_LOGFILE' && $diff->{ DEBUG_LOGFILE })) { @@ -2307,7 +2307,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUMMARY_FILE' && $diff->{ SUMMARY_FILE })) { @@ -2316,7 +2316,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SEQUENCE_FILE' && $diff->{ SEQUENCE_FILE })) { @@ -2325,7 +2325,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCK_FILE' && $diff->{ LOCK_FILE })) { @@ -2334,7 +2334,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCK_DIR' && $diff->{ LOCK_DIR })) { @@ -2343,7 +2343,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCKDIR' && $diff->{ LOCKDIR })) { @@ -2352,7 +2352,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCKFILE' && $diff->{ LOCKFILE })) { @@ -2361,7 +2361,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_INET6' && $diff->{ USE_INET6 })) { @@ -2370,7 +2370,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_INET6' && $diff->{ USE_INET6 })) { @@ -2379,7 +2379,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HOST' && $diff->{ HOST })) { @@ -2388,7 +2388,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PORT' && $diff->{ PORT })) { @@ -2397,7 +2397,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SMTP_SENDER' && $diff->{ SMTP_SENDER })) { @@ -2406,7 +2406,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SMTP_LOG' && $diff->{ SMTP_LOG })) { @@ -2415,7 +2415,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_SMTP_LOG_ROTATE' && $diff->{ USE_SMTP_LOG_ROTATE })) { @@ -2424,7 +2424,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SMTP_LOG_ROTATE_EXPIRE_LIMIT' && $diff->{ SMTP_LOG_ROTATE_EXPIRE_LIMIT })) { @@ -2433,7 +2433,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NUM_SMTP_LOG_ROTATE' && $diff->{ NUM_SMTP_LOG_ROTATE })) { @@ -2442,7 +2442,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SMTP_LOG_ROTATE_TYPE' && $diff->{ SMTP_LOG_ROTATE_TYPE })) { @@ -2451,7 +2451,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOT_TRACE_SMTP' && $diff->{ NOT_TRACE_SMTP })) { @@ -2460,7 +2460,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOT_TRACE_SMTP' && $diff->{ NOT_TRACE_SMTP })) { @@ -2469,7 +2469,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TRACE_SMTP_DELAY' && $diff->{ TRACE_SMTP_DELAY })) { @@ -2478,7 +2478,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_SMTP_PROFILE' && $diff->{ USE_SMTP_PROFILE })) { @@ -2487,7 +2487,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MCI_SMTP_HOSTS' && $diff->{ MCI_SMTP_HOSTS })) { @@ -2496,7 +2496,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_RELAY_SERVER' && $diff->{ DEFAULT_RELAY_SERVER })) { @@ -2505,7 +2505,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RELAY_HACK' && $diff->{ RELAY_HACK })) { @@ -2514,7 +2514,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CF_DEF' && $diff->{ CF_DEF })) { @@ -2523,7 +2523,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_OUTGOING_ADDRESS' && $diff->{ USE_OUTGOING_ADDRESS })) { @@ -2532,7 +2532,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'OUTGOING_ADDRESS' && $diff->{ OUTGOING_ADDRESS })) { @@ -2541,7 +2541,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_VERP' && $diff->{ USE_VERP })) { @@ -2550,7 +2550,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'POSTFIX_VERP_DELIMITERS' && $diff->{ POSTFIX_VERP_DELIMITERS })) { @@ -2559,7 +2559,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TRY_VERP_PER_DAY' && $diff->{ TRY_VERP_PER_DAY })) { @@ -2568,7 +2568,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOT_USE_ESMTP_PIPELINING' && $diff->{ NOT_USE_ESMTP_PIPELINING })) { @@ -2577,7 +2577,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_SMTPFEED_F_OPTION' && $diff->{ USE_SMTPFEED_F_OPTION })) { @@ -2586,7 +2586,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_MIME' && $diff->{ USE_MIME })) { @@ -2595,7 +2595,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_MIME' && $diff->{ USE_MIME })) { @@ -2604,7 +2604,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_BROKEN_ENCODING_FIXUP' && $diff->{ MIME_BROKEN_ENCODING_FIXUP })) { @@ -2613,7 +2613,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_DECODED_ARTICLE' && $diff->{ MIME_DECODED_ARTICLE })) { @@ -2622,7 +2622,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PREAMBLE_MAILBODY' && $diff->{ PREAMBLE_MAILBODY })) { @@ -2631,7 +2631,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TRAILER_MAILBODY' && $diff->{ TRAILER_MAILBODY })) { @@ -2640,7 +2640,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'GOOD_BYE_PHRASE' && $diff->{ GOOD_BYE_PHRASE })) { @@ -2649,7 +2649,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FACE_MARK' && $diff->{ FACE_MARK })) { @@ -2658,7 +2658,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PROC_GEN_INFO' && $diff->{ PROC_GEN_INFO })) { @@ -2667,7 +2667,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_FLOCK' && $diff->{ USE_FLOCK })) { @@ -2676,7 +2676,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_FLOCK' && $diff->{ USE_FLOCK })) { @@ -2685,7 +2685,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAX_TIMEOUT' && $diff->{ MAX_TIMEOUT })) { @@ -2694,7 +2694,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOT_USE_SPOOL' && $diff->{ NOT_USE_SPOOL })) { @@ -2703,7 +2703,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOT_USE_SPOOL' && $diff->{ NOT_USE_SPOOL })) { @@ -2712,7 +2712,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'COMPAT_FML15' && $diff->{ COMPAT_FML15 })) { @@ -2721,7 +2721,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NEWSYSLOG_MAX' && $diff->{ NEWSYSLOG_MAX })) { @@ -2730,7 +2730,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CRONTAB' && $diff->{ CRONTAB })) { @@ -2739,7 +2739,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CRON_PIDFILE' && $diff->{ CRON_PIDFILE })) { @@ -2748,7 +2748,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CRON_NOTIFY' && $diff->{ CRON_NOTIFY })) { @@ -2757,7 +2757,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_CROSSPOST' && $diff->{ USE_CROSSPOST })) { @@ -2766,7 +2766,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_MEMBER_NAME' && $diff->{ USE_MEMBER_NAME })) { @@ -2775,7 +2775,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_EXPIRE' && $diff->{ USE_EXPIRE })) { @@ -2784,7 +2784,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'EXPIRE_SUMMARY' && $diff->{ EXPIRE_SUMMARY })) { @@ -2793,7 +2793,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'EXPIRE_LIMIT' && $diff->{ EXPIRE_LIMIT })) { @@ -2802,7 +2802,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_ARCHIVE' && $diff->{ USE_ARCHIVE })) { @@ -2811,7 +2811,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ARCHIVE_UNIT' && $diff->{ ARCHIVE_UNIT })) { @@ -2820,7 +2820,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_ARCHIVE_UNIT' && $diff->{ DEFAULT_ARCHIVE_UNIT })) { @@ -2829,7 +2829,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ARCHIVE_DIR' && $diff->{ ARCHIVE_DIR })) { @@ -2838,7 +2838,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'INDEX_FILE' && $diff->{ INDEX_FILE })) { @@ -2847,7 +2847,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'INDEX_SHOW_DIRNAME' && $diff->{ INDEX_SHOW_DIRNAME })) { @@ -2856,7 +2856,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIBRARY_DIR' && $diff->{ LIBRARY_DIR })) { @@ -2865,7 +2865,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIBRARY_ARCHIVE_DIR' && $diff->{ LIBRARY_ARCHIVE_DIR })) { @@ -2874,7 +2874,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOGFILE_NEWSYSLOG_LIMIT' && $diff->{ LOGFILE_NEWSYSLOG_LIMIT })) { @@ -2883,7 +2883,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AMLIST_NEWSYSLOG_LIMIT' && $diff->{ AMLIST_NEWSYSLOG_LIMIT })) { @@ -2892,7 +2892,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_HTML_GEN' && $diff->{ AUTO_HTML_GEN })) { @@ -2901,7 +2901,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_HTML_GEN' && $diff->{ AUTO_HTML_GEN })) { @@ -2910,7 +2910,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_NEW_HTML_GEN' && $diff->{ USE_NEW_HTML_GEN })) { @@ -2919,7 +2919,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_NEW_HTML_GEN' && $diff->{ USE_NEW_HTML_GEN })) { @@ -2928,7 +2928,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_THREAD' && $diff->{ HTML_THREAD })) { @@ -2937,7 +2937,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_THREAD' && $diff->{ HTML_THREAD })) { @@ -2946,7 +2946,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_INDEX_REVERSE_ORDER' && $diff->{ HTML_INDEX_REVERSE_ORDER })) { @@ -2955,7 +2955,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_INDEX_REVERSE_ORDER' && $diff->{ HTML_INDEX_REVERSE_ORDER })) { @@ -2964,7 +2964,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_DIR' && $diff->{ HTML_DIR })) { @@ -2973,7 +2973,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_EXPIRE_LIMIT' && $diff->{ HTML_EXPIRE_LIMIT })) { @@ -2982,7 +2982,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_INDEX_TITLE' && $diff->{ HTML_INDEX_TITLE })) { @@ -2991,7 +2991,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_DATA_CACHE' && $diff->{ HTML_DATA_CACHE })) { @@ -3000,7 +3000,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_DATA_THREAD' && $diff->{ HTML_DATA_THREAD })) { @@ -3009,7 +3009,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_OUTPUT_FILTER' && $diff->{ HTML_OUTPUT_FILTER })) { @@ -3018,7 +3018,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_STYLESHEET_BASENAME' && $diff->{ HTML_STYLESHEET_BASENAME })) { @@ -3027,7 +3027,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_THREAD_REF_TYPE' && $diff->{ HTML_THREAD_REF_TYPE })) { @@ -3036,7 +3036,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_THREAD_REF_TYPE' && $diff->{ HTML_THREAD_REF_TYPE })) { @@ -3045,7 +3045,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_THREAD_SORT_TYPE' && $diff->{ HTML_THREAD_SORT_TYPE })) { @@ -3054,7 +3054,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_THREAD_SORT_TYPE' && $diff->{ HTML_THREAD_SORT_TYPE })) { @@ -3063,7 +3063,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_INDEX_UNIT' && $diff->{ HTML_INDEX_UNIT })) { @@ -3072,7 +3072,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_INDENT_STYLE' && $diff->{ HTML_INDENT_STYLE })) { @@ -3081,7 +3081,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_MULTIPART_IMAGE_REF_TYPE' && $diff->{ HTML_MULTIPART_IMAGE_REF_TYPE })) { @@ -3090,7 +3090,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_DEFAULT_UMASK' && $diff->{ HTML_DEFAULT_UMASK })) { @@ -3099,7 +3099,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_WRITE_UMASK' && $diff->{ HTML_WRITE_UMASK })) { @@ -3108,7 +3108,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_DATABASE' && $diff->{ USE_DATABASE })) { @@ -3117,7 +3117,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DATABASE_METHOD' && $diff->{ DATABASE_METHOD })) { @@ -3126,7 +3126,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DATABASE_CACHE_FILE_SUFFIX' && $diff->{ DATABASE_CACHE_FILE_SUFFIX })) { @@ -3135,7 +3135,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DATABASE_DRIVER' && $diff->{ DATABASE_DRIVER })) { @@ -3144,7 +3144,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DATABASE_DRIVER_ATTRIBUTES' && $diff->{ DATABASE_DRIVER_ATTRIBUTES })) { @@ -3153,7 +3153,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SQL_SERVER_HOST' && $diff->{ SQL_SERVER_HOST })) { @@ -3162,7 +3162,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SQL_SERVER_PORT' && $diff->{ SQL_SERVER_PORT })) { @@ -3171,7 +3171,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SQL_SERVER_USER' && $diff->{ SQL_SERVER_USER })) { @@ -3180,7 +3180,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SQL_DATABASE_NAME' && $diff->{ SQL_DATABASE_NAME })) { @@ -3189,7 +3189,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SQL_SERVER_PASSWORD' && $diff->{ SQL_SERVER_PASSWORD })) { @@ -3198,7 +3198,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SQL_DATABASE_NAME' && $diff->{ SQL_DATABASE_NAME })) { @@ -3207,7 +3207,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LDAP_SERVER_HOST' && $diff->{ LDAP_SERVER_HOST })) { @@ -3216,7 +3216,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LDAP_SERVER_PASSWORD' && $diff->{ LDAP_SERVER_PASSWORD })) { @@ -3225,7 +3225,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LDAP_SEARCH_BASE' && $diff->{ LDAP_SEARCH_BASE })) { @@ -3234,7 +3234,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LDAP_SERVER_BIND' && $diff->{ LDAP_SERVER_BIND })) { @@ -3243,7 +3243,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LDAP_QUERY_FILTER' && $diff->{ LDAP_QUERY_FILTER })) { @@ -3252,7 +3252,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_WHOIS' && $diff->{ USE_WHOIS })) { @@ -3261,7 +3261,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_WHOIS_SERVER' && $diff->{ DEFAULT_WHOIS_SERVER })) { @@ -3270,7 +3270,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'WHOIS_DB' && $diff->{ WHOIS_DB })) { @@ -3279,7 +3279,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'WHOIS_HELP_FILE' && $diff->{ WHOIS_HELP_FILE })) { @@ -3288,7 +3288,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'WHOIS_JCODE_P' && $diff->{ WHOIS_JCODE_P })) { @@ -3297,7 +3297,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CPU_TYPE_MANUFACTURER_OS' && $diff->{ CPU_TYPE_MANUFACTURER_OS })) { @@ -3306,7 +3306,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'STRUCT_SOCKADDR' && $diff->{ STRUCT_SOCKADDR })) { @@ -3315,7 +3315,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCK_SH' && $diff->{ LOCK_SH })) { @@ -3324,7 +3324,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCK_EX' && $diff->{ LOCK_EX })) { @@ -3333,7 +3333,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCK_NB' && $diff->{ LOCK_NB })) { @@ -3342,7 +3342,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCK_UN' && $diff->{ LOCK_UN })) { @@ -3351,7 +3351,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'COMPAT_SOLARIS2' && $diff->{ COMPAT_SOLARIS2 })) { @@ -3360,7 +3360,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOT_USE_TIOCNOTTY' && $diff->{ NOT_USE_TIOCNOTTY })) { @@ -3369,7 +3369,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HAS_GETPWUID' && $diff->{ HAS_GETPWUID })) { @@ -3378,7 +3378,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HAS_GETPWGID' && $diff->{ HAS_GETPWGID })) { @@ -3387,7 +3387,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HAS_ALARM' && $diff->{ HAS_ALARM })) { @@ -3396,7 +3396,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'UNISTD' && $diff->{ UNISTD })) { @@ -3405,7 +3405,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SENDMAIL' && $diff->{ SENDMAIL })) { @@ -3414,7 +3414,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TAR' && $diff->{ TAR })) { @@ -3423,7 +3423,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'UUENCODE' && $diff->{ UUENCODE })) { @@ -3432,7 +3432,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'COMPRESS' && $diff->{ COMPRESS })) { @@ -3441,7 +3441,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ZCAT' && $diff->{ ZCAT })) { @@ -3450,7 +3450,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LHA' && $diff->{ LHA })) { @@ -3459,7 +3459,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ISH' && $diff->{ ISH })) { @@ -3468,7 +3468,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ZIP' && $diff->{ ZIP })) { @@ -3477,7 +3477,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'BZIP2' && $diff->{ BZIP2 })) { @@ -3486,7 +3486,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PGP' && $diff->{ PGP })) { @@ -3495,7 +3495,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PGP5' && $diff->{ PGP5 })) { @@ -3504,7 +3504,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PGPE' && $diff->{ PGPE })) { @@ -3513,7 +3513,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PGPK' && $diff->{ PGPK })) { @@ -3522,7 +3522,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PGPS' && $diff->{ PGPS })) { @@ -3531,7 +3531,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PGPV' && $diff->{ PGPV })) { @@ -3540,7 +3540,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'GPG' && $diff->{ GPG })) { @@ -3549,7 +3549,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RCS' && $diff->{ RCS })) { @@ -3558,7 +3558,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CI' && $diff->{ CI })) { @@ -3567,7 +3567,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'BASE64_DECODE' && $diff->{ BASE64_DECODE })) { @@ -3576,7 +3576,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'BASE64_ENCODE' && $diff->{ BASE64_ENCODE })) { @@ -3585,7 +3585,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MD5' && $diff->{ MD5 })) { @@ -3594,7 +3594,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SMTPLOG' && $diff->{ SMTPLOG })) { @@ -3603,7 +3603,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PROHIBIT_COMMAND_FOR_STRANGER' && $diff->{ PROHIBIT_COMMAND_FOR_STRANGER })) { @@ -3612,7 +3612,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PROHIBIT_COMMAND_FOR_STRANGER' && $diff->{ PROHIBIT_COMMAND_FOR_STRANGER })) { @@ -3621,7 +3621,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_LIBMIME' && $diff->{ USE_LIBMIME })) { @@ -3630,7 +3630,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_LIBMIME' && $diff->{ USE_LIBMIME })) { @@ -3639,7 +3639,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIBMIMEDIR' && $diff->{ LIBMIMEDIR })) { @@ -3648,7 +3648,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RPG_ML_FORM_FLAG' && $diff->{ RPG_ML_FORM_FLAG })) { @@ -3657,7 +3657,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RPG_ML_FORM_FLAG' && $diff->{ RPG_ML_FORM_FLAG })) { @@ -3666,7 +3666,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUN_OS_413' && $diff->{ SUN_OS_413 })) { @@ -3675,7 +3675,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUN_OS_413' && $diff->{ SUN_OS_413 })) { @@ -3684,7 +3684,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUBJECT_HML_FORM' && $diff->{ SUBJECT_HML_FORM })) { @@ -3693,7 +3693,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HML_FORM_LONG_ID' && $diff->{ HML_FORM_LONG_ID })) { @@ -3702,7 +3702,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ML_MEMBER_CHECK' && $diff->{ ML_MEMBER_CHECK })) { @@ -3711,7 +3711,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_HTTP_PORT' && $diff->{ DEFAULT_HTTP_PORT })) { @@ -3720,7 +3720,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_GOPHER_PORT' && $diff->{ DEFAULT_GOPHER_PORT })) { @@ -3729,7 +3729,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_HTML_FIELD' && $diff->{ DEFAULT_HTML_FIELD })) { @@ -3738,7 +3738,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CP' && $diff->{ CP })) { @@ -3747,7 +3747,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RM' && $diff->{ RM })) { @@ -3756,7 +3756,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FML' && $diff->{ FML })) { @@ -3765,7 +3765,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOAD_LIBRARY' && $diff->{ LOAD_LIBRARY })) { @@ -3774,7 +3774,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'STORED_BOUNDARY' && $diff->{ STORED_BOUNDARY })) { @@ -3783,7 +3783,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AGAINST_NIFTY' && $diff->{ AGAINST_NIFTY })) { @@ -3792,7 +3792,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq '_Ds' && $diff->{ _Ds })) { @@ -3801,7 +3801,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq '_Dm' && $diff->{ _Dm })) { @@ -3810,7 +3810,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 9e0cc7ef..ba5344ed 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.19 2006/01/04 07:47:26 fukachan Exp $ +# $FML: config_ph.pm,v 1.20 2006/01/08 12:32:51 fukachan Exp $ # package FML::Merge::FML4::config_ph; @@ -333,7 +333,7 @@ translate fml4 config {$key => $value } to fml8 one if could. # Descriptions: translate fml4 config {$key => $value } to fml8 one if could. -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($config) HASH_REF($diff) STR($key) STR($value) # Side Effects: none # Return Value: STR @@ -349,10 +349,10 @@ sub translate }; use FML::Merge::FML4::Rules; - my $s = FML::Merge::FML4::Rules::translate($self, + my $s = FML::Merge::FML4::Rules::translate($self, $dispatch, $config, - $diff, + $diff, $key, $value); return $s; @@ -493,7 +493,7 @@ sub translate_xxx # Descriptions: restrictions -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($config) HASH_REF($diff) STR($key) STR($value) # Side Effects: none # Return Value: STR @@ -513,9 +513,9 @@ sub _fix_restrictions my $mode = 'manual'; my $symmetric = 1; - # + # # permit_*_from based - # + # if ($permit_post_from eq 'anyone') { $p_result .= "article_post_restrictions = "; $p_result .= "reject_system_special_accounts "; @@ -534,7 +534,7 @@ sub _fix_restrictions # # handler based - # + # if ($reject_post_handler =~ /auto_regist|autoregist|auto_subscribe/) { $mode = "automatic"; $symmetric = 1; @@ -572,7 +572,7 @@ sub _fix_restrictions $c_result .= "ignore\n"; } } - elsif ($reject_command_handler =~ + elsif ($reject_command_handler =~ /auto_regist|autoregist|auto_subscribe/) { $mode = "automatic"; $symmetric = 1; @@ -610,7 +610,7 @@ sub _fix_restrictions # Descriptions: handle map info. -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($config) HASH_REF($diff) STR($key) STR($value) # Side Effects: none # Return Value: STR @@ -625,7 +625,7 @@ sub _fix_map # Descriptions: handle directory info. # Arguments: OBJ($self) -# HASH_REF($config) HASH_REF($diff) +# HASH_REF($config) HASH_REF($diff) # STR($key) STR($value) STR($match) # Side Effects: none # Return Value: STR @@ -652,7 +652,7 @@ sub _fix_dir # Descriptions: acl policy. -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($config) HASH_REF($diff) STR($key) STR($value) # Side Effects: none # Return Value: STR @@ -675,7 +675,7 @@ sub _fix_acl_policy # Descriptions: acl policy. -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($config) HASH_REF($diff) STR($key) STR($value) # Side Effects: none # Return Value: STR @@ -694,7 +694,7 @@ sub _fix_module_definition # Descriptions: fix time zone. -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($config) HASH_REF($diff) STR($key) STR($value) # Side Effects: none # Return Value: STR @@ -711,7 +711,7 @@ sub _fix_time_zone # Descriptions: handle subject tag related conversion. -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($config) HASH_REF($diff) STR($key) STR($value) # Side Effects: none # Return Value: STR @@ -725,7 +725,7 @@ sub _fix_skip_fields # Descriptions: handle subject tag related conversion. -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($config) HASH_REF($diff) STR($key) STR($value) # Side Effects: none # Return Value: STR @@ -795,7 +795,7 @@ sub _fix_subject_tag # Descriptions: ignore translation since this variable uses fml8 value. -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($config) HASH_REF($diff) STR($key) STR($value) # Side Effects: none # Return Value: STR @@ -808,7 +808,7 @@ sub translate_use_fml8_value # Descriptions: ignore translation since this variable uses fml8 value. -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($config) HASH_REF($diff) STR($key) STR($value) # Side Effects: none # Return Value: STR @@ -821,7 +821,7 @@ sub translate_ignore # Descriptions: show this variable is not yet implemented. -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($config) HASH_REF($diff) STR($key) STR($value) # Side Effects: none # Return Value: STR |