diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-02-08 16:10:46 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-02-08 16:10:46 +0000 |
| commit | 064a94c915ab9d962a876049ed864a56dc2c7af4 (patch) | |
| tree | bfe823015d699d653670bbaaa51fdac6dba25dea /test | |
| parent | ea49d0e16fbc6f56fc5b8519d266f88d09139187 (diff) | |
Don't add From: or Reply-To: to quota warning messages if they are
provided by quota_warn_message.
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/0095 | 5 | ||||
| -rw-r--r-- | test/mail/0095.userx | 9 | ||||
| -rw-r--r-- | test/scripts/0000-Basic/0095 | 10 |
3 files changed, 17 insertions, 7 deletions
diff --git a/test/confs/0095 b/test/confs/0095 index 1bd71acaa..c9494151d 100644 --- a/test/confs/0095 +++ b/test/confs/0095 @@ -1,5 +1,8 @@ # Exim test configuration 0095 +ERT= +QWM= + exim_path = EXIM_PATH host_lookup_order = bydns primary_hostname = myhost.test.ex @@ -11,6 +14,7 @@ gecos_name = CALLER_NAME # ----- Main settings ----- +ERT # ----- Routers ----- @@ -43,6 +47,7 @@ appendfile: file = DIR/test-mail/$local_part quota = $h_quota quota_warn_threshold = $h_threshold + QWM user = CALLER appendfile2: diff --git a/test/mail/0095.userx b/test/mail/0095.userx index 5e720e10b..bd5e61c81 100644 --- a/test/mail/0095.userx +++ b/test/mail/0095.userx @@ -40,16 +40,14 @@ Received: from root by myhost.test.ex with local (Exim x.yz) id 10HmbA-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Auto-Submitted: auto-replied -From: Mail Delivery System <Mailer-Daemon@myhost.test.ex> +From : p@q +Reply-To: a@b To: userx@myhost.test.ex Subject: Your mailbox Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 -This message is automatically created by mail delivery software (Exim). - -The size of your mailbox has exceeded a warning threshold that is -set by the system administrator. +Your mailbox has crossed the threshold From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -68,6 +66,7 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999 Received: from root by myhost.test.ex with local (Exim x.yz) id 10HmbC-0005vi-00 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Reply-To: x@y Auto-Submitted: auto-replied From: Mail Delivery System <Mailer-Daemon@myhost.test.ex> To: userx@myhost.test.ex diff --git a/test/scripts/0000-Basic/0095 b/test/scripts/0000-Basic/0095 index 45b6a7053..ba41247c0 100644 --- a/test/scripts/0000-Basic/0095 +++ b/test/scripts/0000-Basic/0095 @@ -7,12 +7,18 @@ quota: 0 threshold: 10 This is a test message **** -exim -odi userx +exim -DERT='errors_reply_to = x@y' \ + -DQWM='quota_warn_message = From : p@q\n\ + Reply-To: a@b\n\ + To: $local_part@$domain\n\ + Subject: Your mailbox\n\n\ + Your mailbox has crossed the threshold\n' \ + -odi userx quota: 10K threshold: 900 A test message **** -exim -odi userx +exim -DERT='errors_reply_to = x@y' -odi userx quota: 2200 threshold: 90% This is a test message |