enhance configurations for more checks

1 files changed, 54 insertions, 52 deletions

diff --git a/regress/fml4to8/CF b/regress/fml4to8/CF
index 2ae9be90..1d48edfe 100644
--- a/regress/fml4to8/CF
+++ b/regress/fml4to8/CF
@@ -4,50 +4,51 @@ LANGUAGE                       = Japanese | English
 MESSAGE_LANGUAGE               = Japanese | English
 DOMAINNAME                     = &fix:dn   phys.titech.ac.jp
 FQDN                           = &fix:fqdn axion.phys.titech.ac.jp
-MAIL_LIST                      =
+MAIL_LIST                      = elena\@fml.org | rudo\@nuinui.net
 PERMIT_POST_FROM               = members_only | anyone | moderator
 REJECT_POST_HANDLER            = reject | ignore | auto_subscribe | auto_regist
 CONTROL_ADDRESS                =
 PERMIT_COMMAND_FROM            = members_only | anyone | moderator
 REJECT_COMMAND_HANDLER         = reject | ignore | auto_subscribe | auto_regist
 MAIL_LIST_ACCEPT_COMMAND       = 1 | 0
-MAINTAINER                     =
-MAINTAINER_SIGNATURE           =
-ML_FN                          =
-SPOOL_DIR                      = spool
-TMP_DIR                        = tmp
-VAR_DIR                        = var
-VARLOG_DIR                     = var/log
-VARRUN_DIR                     = var/run
-VARDB_DIR                      = var/db
+MAINTAINER                     = admin\@\$FQDN | admin\@\$DOMAINNAME | admin\@fml
+MAINTAINER_SIGNATURE           = "" | Elena Lolobrigita
+ML_FN                          = "" | Freekick
+SPOOL_DIR                      = spool    | spool2
+TMP_DIR                        = tmp      | tmp2
+VAR_DIR                        = var      | var2
+VARLOG_DIR                     = var/log  | var2/log2
+VARRUN_DIR                     = var/run  | var2/run2
+VARDB_DIR                      = var/db   | var2/db2
 MANUAL_REGISTRATION_TYPE       = confirmation | forward_to_admin
 MANUAL_REGISTRATION_CONFIRMATION_FILE = $DIR/confirm.msub
 AUTO_REGISTRATION_TYPE         = confirmation | subject | body | no-keyword
-AUTO_REGISTRATION_KEYWORD      = subscribe
+AUTO_REGISTRATION_KEYWORD      = subscribe | subxxx
 AUTO_REGISTRATION_DEFAULT_MODE =
 CONFIRMATION_ADDRESS           =
-CONFIRMATION_SUBSCRIBE         = subscribe
-CONFIRMATION_KEYWORD           = confirm
+CONFIRMATION_SUBSCRIBE         = subscribe | subxxx
+CONFIRMATION_KEYWORD           = confirm | confirmxxx
 CONFIRMATION_WELCOME_STATEMENT =
 CONFIRMATION_SUBSCRIBE_NEED_YOUR_NAME = 1 | 0
 CONFIRMATION_FILE              = $DIR/confirm
 CONFIRMATION_EXPIRE            = 0 | 1 | 987654321
 CONFIRMATION_LIST              =
-DEFAULT_SUBSCRIBE              = subscribe
+DEFAULT_SUBSCRIBE              = subscribe | subxxx
 WELCOME_FILE                   = $DIR/welcome
 WELCOME_STATEMENT              = Welcome to our $ML_FN\n         You are added automatically
-FILE_TO_REGIST                 =
+FILE_TO_REGIST                 = $DIR/m | memberlist | /tmp/memberlst
 AUTO_REGISTERED_UNDELIVER_P    = 1 | 0
 AUTO_REGISTRATION_LINES_LIMIT  = 1 | 0
 CONFIRMD_ACK_REQ_FILE          = $DIR/confirmd.ackreq
 CONFIRMD_ACK_LOGFILE           = $VARLOG_DIR/confirmd.ack
-CONFIRMD_ACK_EXPIRE_UNIT       = number | ( number + month | week | day )
-CONFIRMD_ACK_WAIT_UNIT         = number | ( number + month | week | day )
-REMOTE_ADMINISTRATION          = 1 | 0
+CONFIRMD_ACK_EXPIRE_UNIT       = number | number + month | week | day
+CONFIRMD_ACK_WAIT_UNIT         = number | number + month | week | day
+REMOTE_ADMINISTRATION          = 1 | 0 | ""
+REMOTE_ADMINISTRATION_REQUIRE_PASSWORD = 1 | 0 | ""
 REMOTE_ADMINISTRATION_AUTH_TYPE = crypt | address | md5 | pgp | pgp2 | pgp5 | gpgp
-ADMIN_MEMBER_LIST              = $DIR/members-admin
+ADMIN_MEMBER_LIST              = admin | $DIR/members-admin | /tmp/m-a
 ADMIN_HELP_FILE                = $DIR/help-admin
-PASSWD_FILE                    = $DIR/etc/passwd
+PASSWD_FILE                    = $DIR/etc/passwd | $DIR/etc/passwd-admin
 ADMIN_ADD_SEND_WELCOME_FILE    = 1 | 0
 ADMIN_LOG_DEFAULT_LINE_LIMIT   = 0 | 1 | 987654321
 PGP_PATH                       = $DIR/etc/pgp
@@ -57,16 +58,16 @@ DIST_ENCRYPT_KEYRING_DIR       = $DIR/etc/dist-encrypt
 ADMIN_AUTH_KEYRING_DIR         = $DIR/etc/admin-auth
 ADMIN_ENCRYPT_KEYRING_DIR      = $DIR/etc/admin-encrypt
 MODERATOR_FORWARD_TYPE         = 1 | 2 | 3
-MODERATOR_MEMBER_LIST          = $DIR/moderators
+MODERATOR_MEMBER_LIST          = $DIR/moderators | $DIR/m
 MODERATOR_EXPIRE_LIMIT         = 0 | 1 | 987654321
-REJECT_ADDR                    = root|postmaster|MAILER-DAEMON|msgs|nobody|news|majordomo|listserv|listproc|\S+\-help|\S+\-subscribe|\S+\-unsubscribe
+REJECT_ADDR                    = root|postmaster|MAILER-DAEMON|msgs|nobody|news|majordomo|listserv|listproc|\S+\-help|\S+\-subscribe|\S+\-unsubscribe | xxx|yy
 REJECT_ADDR_LIST               = $DIR/spamlist
 NOT_USE_UNIX_FROM_LOOP_CHECK   = 1 | 0
 CHECK_MESSAGE_ID               = 1 | 0
 CHECK_MAILBODY_CKSUM           = 1 | 0
 LOG_CONNECTION                 = 1 | 0
 ADDR_CHECK_MAX                 = 0 | 1 | 987654321
-INCOMING_MAIL_SIZE_LIMIT       = 0 | 1 | 987654321
+INCOMING_MAIL_SIZE_LIMIT       = 0 | 1 | 3K | 10M | 987654321
 NOTIFY_MAIL_SIZE_OVERFLOW      = 1 | 0
 ANNOUNCE_MAIL_SIZE_OVERFLOW    = 1 | 0
 MAX_MEMBER_LIMIT               = 0 | 1 | 987654321
@@ -83,7 +84,7 @@ FILTER_ATTR_REJECT_INVALID_JAPANESE = 1 | 0
 CONTENT_HANDLER_CUTOFF_EMPTY_MESSAGE = 1 | 0
 CONTENT_HANDLER_REJECT_EMPTY_MESSAGE = 1 | 0
 USE_HANKAKU_CONVERTER          = 1 | 0
-HTML_MAIL_DEFAULT_HANDLER      = "strip" | "reject" | ""
+HTML_MAIL_DEFAULT_HANDLER      = strip | reject | ""
 USE_MTI                        = 1 | 0
 MTI_WARN_INTERVAL              = 0 | 1 | 987654321
 MTI_WARN_LASTLOG               =
@@ -93,11 +94,11 @@ MTI_BURST_HARD_LIMIT           = 0 | 1 | 987654321
 MTI_COST_EVAL_FUNCTION         = MTISimpleBomberP
 MTI_MAIL_FROM_HINT_LIST        = $DIR/mti_mailfrom.hints
 SUBSCRIBE_ANNOUNCE_FORWARD_TYPE = raw | prepend_info
-UNSUBSCRIBE_AUTH_TYPE          = confirmation
-CHADDR_AUTH_TYPE               = confirmation | ""
+UNSUBSCRIBE_AUTH_TYPE          = confirmation | "" | xxx
+CHADDR_AUTH_TYPE               = confirmation | "" | xxx
 USE_LOG_MAIL                   = 1 | 0
-LOG_MAIL_DIR                   = $VAR_DIR/Mail
-LOG_MAIL_SEQ                   = $LOG_MAIL_DIR/.seq
+LOG_MAIL_DIR                   = $VAR_DIR/Mail | /tmp/m
+LOG_MAIL_SEQ                   = $LOG_MAIL_DIR/.seq | /tmp/seq
 NUM_LOG_MAIL                   = 0 | 1 | 987654321
 LOG_MAIL_FILE_SIZE_MAX         = 0 | 1 | 987654321
 USE_ENCRYPTED_DISTRIBUTION     = 1 | 0
@@ -113,27 +114,27 @@ SUBJECT_FREE_FORM              =
 SUBJECT_FREE_FORM_REGEXP       =
 SUBJECT_FORM_LONG_ID           =
 USE_ERRORS_TO                  = 1 | 0
-ERRORS_TO                      =
+ERRORS_TO                      = elena\@fml.org | r\@\$DOMAINNAME | r\@\$FQDN
 USE_ORIGINAL_MESSAGE_ID        = 1 | 0
-PRECEDENCE                     = bulk
+PRECEDENCE                     = bulk | list
 APPEND_STARDATE                = 1 | 0
 USE_RFC2369                    = 1 | 0
-LIST_SOFTWARE                  = 1 | 0
-LIST_POST                      = 1 | 0
-LIST_OWNER                     = 1 | 0
-LIST_HELP                      = 1 | 0
-LIST_SUBSCRIBE                 = 1 | 0
-LIST_UNSUBSCRIBE               = 1 | 0
-LIST_ID                        = 1 | 0
+LIST_SOFTWARE                  = "" | fml8-current
+LIST_POST                      = "" | <mailto:>
+LIST_OWNER                     = "" | <mailto:>
+LIST_HELP                      = "" | <mailto:>
+LIST_SUBSCRIBE                 = "" | <mailto:>
+LIST_UNSUBSCRIBE               = "" | <mailto:>
+LIST_ID                        = "" | <elena.home.fml.org>
 REWRITE_TO                     = 0 | 1 | 2
-Subject                        =
-From_address                   = not.found
-User                           = not.found
-Date                           = not.found
+Subject                        = "" | not.found
+From_address                   = "" | not.found
+User                           = "" | not.found
+Date                           = "" | not.found
 TZone                          = +\d{4} | -\d{4}
 TZONE_DST                      = +\d{4} | -\d{4}
 PASS_ALL_FIELDS_IN_HEADER      = 1 | 0
-SKIP_FIELDS                    = Return-Receipt-To
+SKIP_FIELDS                    = Return-Receipt-To | X|Y
 ALLOW_WRONG_LINES_IN_HEADER    = 1 | 0
 COMMAND_SYNTAX_EXTENSION       = 1 | 0
 USE_SUBJECT_AS_COMMANDS        = 1 | 0
@@ -183,22 +184,22 @@ GUIDE_FILE                     = $DIR/guide
 OBJECTIVE_FILE                 = $DIR/objective
 HELP_FILE                      = $DIR/help
 DENY_FILE                      = $DIR/deny
-LOGFILE                        = $DIR/log
-MGET_LOGFILE                   = $DIR/log
+LOGFILE                        = $DIR/log | $DIR/l | /tmp/log
+MGET_LOGFILE                   = $DIR/log | $DIR/l | /tmp/mlog
 LOGFILE_SUFFIX                 = srtings
-DEBUG_LOGFILE                  = $DIR/log.debug
-SUMMARY_FILE                   = $DIR/summary
-SEQUENCE_FILE                  = $DIR/seq
+DEBUG_LOGFILE                  = $DIR/log.debug | $DIR/d | /tmp/d
+SUMMARY_FILE                   = $DIR/summary | $DIR/s | /tmp/s
+SEQUENCE_FILE                  = $DIR/seq | $DIR/s | /tmp/s
 LOCK_FILE                      = $VARRUN_DIR/lockfile.v7
 USE_INET6                      = 1 | 0
-HOST                           = localhost
-PORT                           = 0 | 1 | 987654321
-SMTP_SENDER                    = rudo@nuinui.net
+HOST                           = localhost | elena
+PORT                           = 1 | 987654321
+SMTP_SENDER                    = rudo\@nuinui.net | elena-admin\@fml.org | x\@\$DOMAINNAME
 SMTP_LOG                       = $VARLOG_DIR/_smtplog
 USE_SMTP_LOG_ROTATE            = 1 | 0
 SMTP_LOG_ROTATE_EXPIRE_LIMIT   = 0 | 1 | 987654321
 NUM_SMTP_LOG_ROTATE            = 0 | 1 | 987654321
-SMTP_LOG_ROTATE_TYPE           = number | day
+SMTP_LOG_ROTATE_TYPE           = 0 | 1 | day
 NOT_TRACE_SMTP                 = 1 | 0
 TRACE_SMTP_DELAY               = 1 | 0
 USE_SMTP_PROFILE               = 1 | 0
@@ -209,7 +210,7 @@ CF_DEF                         =
 USE_OUTGOING_ADDRESS           = 1 | 0
 OUTGOING_ADDRESS               =
 USE_VERP                       = 1 | 0
-POSTFIX_VERP_DELIMITERS        = +=
+POSTFIX_VERP_DELIMITERS        = += | X=
 TRY_VERP_PER_DAY               = 1 | 0
 NOT_USE_ESMTP_PIPELINING       = 1 | 0
 USE_SMTPFEED_F_OPTION          = 1 | 0
@@ -316,3 +317,4 @@ CI                             = &path(ci)
 BASE64_DECODE                  =
 BASE64_ENCODE                  =
 MD5                            = &path(md5:md5sum)
+ML_MEMBER_CHECK                = 1 | 0