diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2016-09-28 19:41:08 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2016-09-28 22:02:50 +0100 |
| commit | ddf1b11a732e293cd242c80bc63d459dda595bf4 (patch) | |
| tree | 62ef610c900c492f332fe511547eeae1ce8900e8 | |
| parent | 60d10ce7e68a5f2cf771a5c079521c8e4f18d157 (diff) | |
| download | exim4-ddf1b11a732e293cd242c80bc63d459dda595bf4.tar.gz | |
Default to filesystem space/inode checking enabled
39 files changed, 178 insertions, 18 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index f123b3b39..a6d477680 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -14324,11 +14324,15 @@ $primary_hostname-$tod_epoch-testing See section &<<CALLaddparcall>>& for details of how this value is used. -.option check_log_inodes main integer 0 +.new +.option check_log_inodes main integer 100 +.wen See &%check_spool_space%& below. -.option check_log_space main integer 0 +.new +.option check_log_space main integer 10M +.wen See &%check_spool_space%& below. .oindex "&%check_rfc2047_length%&" @@ -14343,11 +14347,15 @@ of the RFC, generates overlong encoded words. If &%check_rfc2047_length%& is set false, Exim recognizes encoded words of any length. -.option check_spool_inodes main integer 0 +.new +.option check_spool_inodes main integer 100 +.wen See &%check_spool_space%& below. -.option check_spool_space main integer 0 +.new +.option check_spool_space main integer 10M +.wen .cindex "checking disk space" .cindex "disk space, checking" .cindex "spool directory" "checking space" @@ -14358,7 +14366,7 @@ message is accepted. .vindex "&$log_space$&" .vindex "&$spool_inodes$&" .vindex "&$spool_space$&" -When any of these options are set, they apply to all incoming messages. If you +When any of these options are nonzero, they apply to all incoming messages. If you want to apply different checks to different kinds of message, you can do so by testing the variables &$log_inodes$&, &$log_space$&, &$spool_inodes$&, and &$spool_space$& in an ACL with appropriate additional conditions. @@ -14367,7 +14375,7 @@ testing the variables &$log_inodes$&, &$log_space$&, &$spool_inodes$&, and &%check_spool_space%& and &%check_spool_inodes%& check the spool partition if either value is greater than zero, for example: .code -check_spool_space = 10M +check_spool_space = 100M check_spool_inodes = 100 .endd The spool partition is the one that contains the directory defined by @@ -14386,13 +14394,21 @@ SIZE parameter on the MAIL command, its value is added to the &%check_spool_space%& is zero, unless &%no_smtp_check_spool_space%& is set. The values for &%check_spool_space%& and &%check_log_space%& are held as a -number of kilobytes. If a non-multiple of 1024 is specified, it is rounded up. +number of kilobytes (though specified in bytes). +If a non-multiple of 1024 is specified, it is rounded up. For non-SMTP input and for batched SMTP input, the test is done at start-up; on failure a message is written to stderr and Exim exits with a non-zero code, as it obviously cannot send an error message of any kind. .new +There is a slight performance penalty for these checks. +Versions of Exim preceding 4.88 had these disabled by default; +high-rate intallations confident they will never run out of resources +may wish to deliberately disable them. +.wen + +.new .option chunking_advertise_hosts main "host list&!!" * .cindex CHUNKING advertisement .cindex "RFC 3030" "CHUNKING" diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 28007d01f..d6d805a43 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -104,6 +104,10 @@ JH/27 Fix a possible security hole, wherein a process operating with the Exim discovery and writeup. Ubuntu bug 1580454; no bug raised against Exim itself :( +JH/28 Enable {spool,log} filesystem space and inode checks as default. + Main config options check_{log,spool}_{inodes,space} are now + 100 inodes, 10MB unless set otherwise in the configuration. + Exim version 4.87 ----------------- diff --git a/src/src/globals.c b/src/src/globals.c index cb71a6094..631e1d61c 100644 --- a/src/src/globals.c +++ b/src/src/globals.c @@ -488,11 +488,11 @@ int callout_cache_positive_expire = 24*60*60; int callout_cache_negative_expire = 2*60*60; uschar *callout_random_local_part = US"$primary_hostname-$tod_epoch-testing"; uschar *check_dns_names_pattern= US"(?i)^(?>(?(1)\\.|())[^\\W](?>[a-z0-9/_-]*[^\\W])?)+(\\.?)$"; -int check_log_inodes = 0; -int check_log_space = 0; +int check_log_inodes = 100; +int check_log_space = 10*1024; /* 10K Kbyte == 10MB */ BOOL check_rfc2047_length = TRUE; -int check_spool_inodes = 0; -int check_spool_space = 0; +int check_spool_inodes = 100; +int check_spool_space = 10*1024; /* 10K Kbyte == 10MB */ uschar *chunking_advertise_hosts = US"*"; unsigned chunking_datasize = 0; diff --git a/src/src/receive.c b/src/src/receive.c index 51ce2844e..e53587619 100644 --- a/src/src/receive.c +++ b/src/src/receive.c @@ -124,6 +124,7 @@ receive_statvfs(BOOL isspool, int *inodeptr) { #ifdef HAVE_STATFS struct STATVFS statbuf; +struct stat dummy; uschar *path; uschar *name; uschar buffer[1024]; @@ -180,12 +181,18 @@ else memset(&statbuf, 0, sizeof(statbuf)); if (STATVFS(CS path, &statbuf) != 0) - { - log_write(0, LOG_MAIN|LOG_PANIC, "cannot accept message: failed to stat " - "%s directory %s: %s", name, spool_directory, strerror(errno)); - smtp_closedown(US"spool or log directory problem"); - exim_exit(EXIT_FAILURE); - } + if (stat(CS path, &dummy) == -1 && errno == ENOENT) + { /* Can happen on first run after installation */ + *inodeptr = -1; + return -1; + } + else + { + log_write(0, LOG_MAIN|LOG_PANIC, "cannot accept message: failed to stat " + "%s directory %s: %s", name, path, strerror(errno)); + smtp_closedown(US"spool or log directory problem"); + exim_exit(EXIT_FAILURE); + } *inodeptr = (statbuf.F_FILES > 0)? statbuf.F_FAVAIL : -1; @@ -193,9 +200,9 @@ if (STATVFS(CS path, &statbuf) != 0) return (int)(((double)statbuf.F_BAVAIL * (double)statbuf.F_FRSIZE)/1024.0); +#else /* Unable to find partition sizes in this environment. */ -#else *inodeptr = -1; return -1; #endif diff --git a/test/runtest b/test/runtest index d9005e83d..b4c66840a 100755 --- a/test/runtest +++ b/test/runtest @@ -1027,6 +1027,9 @@ RESET_AFTER_EXTRA_LINE_READ: # Sizes vary with test hostname s/^cmd buf flush \d+ bytes$/cmd buf flush ddd bytes/; + # Spool filesystem free space changes on different systems. + s/^((spool|log) directory space =) \d+K (inodes =) \d+/$1 nnnnnK $3 nnnnn/; + # When Exim is checking the size of directories for maildir, it uses # the check_dir_size() function to scan directories. Of course, the order # of the files that are obtained using readdir() varies from system to diff --git a/test/stderr/0022 b/test/stderr/0022 index c51b15bda..f054aa55d 100644 --- a/test/stderr/0022 +++ b/test/stderr/0022 @@ -26,6 +26,8 @@ host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<x@y> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<warn_empty@test.ex> using ACL "warn_empty" @@ -93,6 +95,8 @@ host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<x@y> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<warn_log@test.ex> using ACL "warn_log" @@ -163,6 +167,8 @@ host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<x@y> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<warn_user@test.ex> using ACL "warn_user" diff --git a/test/stderr/0092 b/test/stderr/0092 index 197256b81..93f70e59c 100644 --- a/test/stderr/0092 +++ b/test/stderr/0092 @@ -80,6 +80,8 @@ considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:userx@test.ex +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:userx@test.ex using ACL "check_recipient" diff --git a/test/stderr/0094 b/test/stderr/0094 index 5ab751696..c0dbb7d26 100644 --- a/test/stderr/0094 +++ b/test/stderr/0094 @@ -109,6 +109,8 @@ host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<userx@test.ex> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<userx@test.ex> using ACL "check_recipient" diff --git a/test/stderr/0275 b/test/stderr/0275 index 1878d3618..32eb941e3 100644 --- a/test/stderr/0275 +++ b/test/stderr/0275 @@ -127,6 +127,8 @@ DSN: r3 propagating DSN originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 Sender: CALLER@test.ex Recipients: userx@test.ex diff --git a/test/stderr/0278 b/test/stderr/0278 index 702d35acc..657ecb071 100644 --- a/test/stderr/0278 +++ b/test/stderr/0278 @@ -78,6 +78,8 @@ DSN: r5 propagating DSN originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 Sender: CALLER@test.ex Recipients: CALLER@test.ex diff --git a/test/stderr/0294 b/test/stderr/0294 index abd94f4f1..590191625 100644 --- a/test/stderr/0294 +++ b/test/stderr/0294 @@ -9,6 +9,8 @@ LOG: smtp_connection MAIN SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<x@y> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<one@z> SMTP>> 250 Accepted @@ -56,6 +58,8 @@ SMTP>> 250 OK id=10HmaX-0005vi-00 smtp_setup_msg entered SMTP<< mail from:<x@y> rate limit MAIL: delay 1 sec +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<two@z> SMTP>> 250 Accepted @@ -87,6 +91,8 @@ SMTP>> 250 OK id=10HmaY-0005vi-00 smtp_setup_msg entered SMTP<< mail from:<x@y> rate limit MAIL: delay 2 sec +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< quit SMTP>> 221 myhost.test.ex closing connection @@ -112,6 +118,8 @@ host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<x@y> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<one@z> processing "deny" @@ -158,6 +166,8 @@ host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<x@y> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<one@z> processing "deny" @@ -197,6 +207,8 @@ LOG: smtp_connection MAIN SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<x@y> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<reject@z> SMTP>> 550 Administrative prohibition @@ -226,6 +238,8 @@ SMTP<< rset SMTP>> 250 Reset OK SMTP<< mail from:<x@y> rate limit MAIL: delay 1 sec +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<reject@z> SMTP>> 550 Administrative prohibition @@ -235,6 +249,8 @@ SMTP<< rset SMTP>> 250 Reset OK SMTP<< mail from:<x@y> rate limit MAIL: delay 2 sec +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< quit SMTP>> 221 myhost.test.ex closing connection diff --git a/test/stderr/0303 b/test/stderr/0303 index 598ed62ed..a5d98ee97 100644 --- a/test/stderr/0303 +++ b/test/stderr/0303 @@ -77,6 +77,8 @@ SMTP>> 250-myhost.test.ex Hello [V4NET.2.3.4] [V4NET.2.3.4] 250-PIPELINING 250 HELP SMTP<< mail from:<> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<x@y> processing "accept" @@ -151,6 +153,8 @@ SMTP>> 250-myhost.test.ex Hello host.name.tld [V4NET.2.3.4] 250-PIPELINING 250 HELP SMTP<< mail from:<> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<x@y> processing "accept" diff --git a/test/stderr/0317 b/test/stderr/0317 index 5ffdc4a36..9f914d7fb 100644 --- a/test/stderr/0317 +++ b/test/stderr/0317 @@ -3,6 +3,8 @@ configuration file is TESTSUITE/test-config admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 Sender: CALLER@test.ex >>Headers received: To: x@y.z @@ -37,6 +39,8 @@ configuration file is TESTSUITE/test-config admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 Sender: CALLER@test.ex >>Headers received: To: x@y.z diff --git a/test/stderr/0361 b/test/stderr/0361 index bcceadc7e..2506e1cfb 100644 --- a/test/stderr/0361 +++ b/test/stderr/0361 @@ -21,6 +21,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 Sender: CALLER@test.ex Recipients: kilos@recurse.test.ex diff --git a/test/stderr/0362 b/test/stderr/0362 index c2b6e25f4..59066ac14 100644 --- a/test/stderr/0362 +++ b/test/stderr/0362 @@ -27,6 +27,8 @@ host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<x@y> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<x@a.b.c> using ACL "check_rcpt" diff --git a/test/stderr/0371 b/test/stderr/0371 index 5f97d4e09..0824ae85b 100644 --- a/test/stderr/0371 +++ b/test/stderr/0371 @@ -44,6 +44,8 @@ SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0] 250-PIPELINING 250 HELP SMTP<< mail from:<x@y> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 using ACL "mail" processing "accept" check set acl_c0 = $acl_c0; mail @@ -121,6 +123,8 @@ LOG: MAIN VRFY failed for x@y H=(something) [V4NET.0.0.0] SMTP>> 550 <x@y> Unrouteable address SMTP<< mail from:<x@y> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 using ACL "mail" processing "accept" check set acl_c0 = $acl_c0; mail diff --git a/test/stderr/0381 b/test/stderr/0381 index d5e9ee6fc..0ae0c27d3 100644 --- a/test/stderr/0381 +++ b/test/stderr/0381 @@ -28,6 +28,8 @@ host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<notgov@test.ex> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<x@test.ex> using ACL "check_rcpt" diff --git a/test/stderr/0386 b/test/stderr/0386 index aaea76063..6bcf40f7a 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -29,6 +29,8 @@ host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<x@y> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<1@b> read ACL from file TESTSUITE/aux-fixed/0386.acl1 @@ -76,6 +78,8 @@ LOG: MAIN REJECT SMTP<< rset SMTP>> 250 Reset OK SMTP<< mail from:<x@y> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<1@b> using ACL "TESTSUITE/aux-fixed/0386.acl1" @@ -158,6 +162,8 @@ host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<x@y> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<2@b> read ACL from file TESTSUITE/aux-fixed/0386.acl2 @@ -343,6 +349,8 @@ smtp_setup_msg entered SMTP<< rset SMTP>> 250 Reset OK SMTP<< mail from:<x@y> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<2@b> using ACL "TESTSUITE/aux-fixed/0386.acl2" diff --git a/test/stderr/0388 b/test/stderr/0388 index b4d405fc2..92b3f23e1 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -180,6 +180,8 @@ DSN: r1 propagating DSN originator: uid=EXIM_UID gid=EXIM_GID login=EXIMUSER name= sender address = set_process_info: pppp accepting a local non-SMTP message from <> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 Sender: search_tidyup called >>Headers received: diff --git a/test/stderr/0391 b/test/stderr/0391 index 31fd790e9..b1151181b 100644 --- a/test/stderr/0391 +++ b/test/stderr/0391 @@ -24,6 +24,8 @@ host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<U@W.x.y> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<B@a.b.c> using ACL "acl_rcpt" diff --git a/test/stderr/0396 b/test/stderr/0396 index 24b785652..7df2a2c8d 100644 --- a/test/stderr/0396 +++ b/test/stderr/0396 @@ -14,6 +14,8 @@ LOG: smtp_connection MAIN SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<x@y> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<x@y> processing "accept" diff --git a/test/stderr/0398 b/test/stderr/0398 index f7d82042f..3825d7e86 100644 --- a/test/stderr/0398 +++ b/test/stderr/0398 @@ -18,6 +18,8 @@ LOG: smtp_connection MAIN SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<qq@remote> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<abc@local> using ACL "rcpt" diff --git a/test/stderr/0402 b/test/stderr/0402 index ed2835589..5f88af295 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -19,6 +19,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 Sender: CALLER@test.ex Recipients: CALLER@test.ex diff --git a/test/stderr/0403 b/test/stderr/0403 index d75d61b01..ccb40a98f 100644 --- a/test/stderr/0403 +++ b/test/stderr/0403 @@ -11,6 +11,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 Sender: CALLER@test.ex Recipients: userx@test.ex diff --git a/test/stderr/0404 b/test/stderr/0404 index a1945a2a7..db58c0de6 100644 --- a/test/stderr/0404 +++ b/test/stderr/0404 @@ -14,6 +14,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 Sender: CALLER@test.ex Recipients: userx @@ -264,6 +266,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = set_process_info: pppp accepting a local non-SMTP message from <> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 Sender: search_tidyup called >>Headers received: diff --git a/test/stderr/0408 b/test/stderr/0408 index cd782a8cc..45bd3fe4b 100644 --- a/test/stderr/0408 +++ b/test/stderr/0408 @@ -11,6 +11,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 Sender: CALLER@test.ex Recipients: userx@test.ex diff --git a/test/stderr/0432 b/test/stderr/0432 index 722408372..2e2a8c1ee 100644 --- a/test/stderr/0432 +++ b/test/stderr/0432 @@ -49,6 +49,8 @@ host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<x@y> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 using ACL "mail" processing "accept" check verify = sender/callout=1s,maxwait=1s @@ -151,6 +153,8 @@ host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<x@y> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 using ACL "mail" processing "accept" check verify = sender/callout=1s,maxwait=1s diff --git a/test/stderr/0464 b/test/stderr/0464 index cf094ce21..32160e76e 100644 --- a/test/stderr/0464 +++ b/test/stderr/0464 @@ -16,6 +16,8 @@ LOG: smtp_connection MAIN SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<abc@domain1> using ACL "rcpt" diff --git a/test/stderr/0465 b/test/stderr/0465 index 01b71ac81..69c9d0e93 100644 --- a/test/stderr/0465 +++ b/test/stderr/0465 @@ -17,6 +17,8 @@ LOG: smtp_connection MAIN SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<abc@domain.> LOG: smtp_syntax_error MAIN @@ -48,6 +50,8 @@ LOG: smtp_connection MAIN SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<abc@domain.> processing "accept" @@ -119,6 +123,8 @@ LOG: smtp_connection MAIN SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<abc@xyz> processing "accept" diff --git a/test/stderr/0471 b/test/stderr/0471 index eba0e4a52..b03d6a0c6 100644 --- a/test/stderr/0471 +++ b/test/stderr/0471 @@ -8,6 +8,8 @@ changed uid/gid: privilege not needed originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@myhost.test.ex> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 Sender: CALLER@myhost.test.ex Recipients: r1@test.ex diff --git a/test/stderr/0479 b/test/stderr/0479 index a5e9f82cc..384ca1cde 100644 --- a/test/stderr/0479 +++ b/test/stderr/0479 @@ -30,6 +30,8 @@ sender_rcvhost = [1.2.3.4] set_process_info: pppp handling incoming connection from ([1.2.3.4]) [1.2.3.4] SMTP>> 250 the.local.host.name Hello [1.2.3.4] [1.2.3.4] SMTP<< mail from:<a@b> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<c@d> using ACL "rcpt" diff --git a/test/stderr/0487 b/test/stderr/0487 index 7b7aca3fe..25c8b5568 100644 --- a/test/stderr/0487 +++ b/test/stderr/0487 @@ -29,6 +29,8 @@ SMTP>> 250-myhost.test.ex Hello CALLER at x.y 250-PIPELINING 250 HELP SMTP<< mail from:<x@y> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<userx@test.ex> processing "accept" diff --git a/test/stderr/0489 b/test/stderr/0489 index 23b0212a0..654bf15da 100644 --- a/test/stderr/0489 +++ b/test/stderr/0489 @@ -4,6 +4,8 @@ trusted user admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name="Phil Q. Hazel" sender address = CALLER@myhost.test.ex +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 Sender: CALLER@myhost.test.ex Recipients: X @@ -36,6 +38,8 @@ trusted user admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=John "Jack" Smith sender address = CALLER@myhost.test.ex +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 Sender: CALLER@myhost.test.ex Recipients: X @@ -67,6 +71,8 @@ trusted user admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=John "Jack" "Q." Smith sender address = CALLER@myhost.test.ex +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 Sender: CALLER@myhost.test.ex Recipients: X @@ -98,6 +104,8 @@ trusted user admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name="John (Jack) Q. Smith" sender address = CALLER@myhost.test.ex +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 Sender: CALLER@myhost.test.ex Recipients: X @@ -129,6 +137,8 @@ trusted user admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=John ("Jack") "Q." Smith sender address = CALLER@myhost.test.ex +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 Sender: CALLER@myhost.test.ex Recipients: X @@ -160,6 +170,8 @@ trusted user admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name="John (\"Jack\") Q. Smith" sender address = CALLER@myhost.test.ex +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 Sender: CALLER@myhost.test.ex Recipients: X @@ -191,6 +203,8 @@ trusted user admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name="Phil \"Q Hazel" sender address = CALLER@myhost.test.ex +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 Sender: CALLER@myhost.test.ex Recipients: X @@ -222,6 +236,8 @@ trusted user admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name="Phil \"Q" "X." Hazel sender address = CALLER@myhost.test.ex +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 Sender: CALLER@myhost.test.ex Recipients: X diff --git a/test/stderr/0575 b/test/stderr/0575 index fb8282a6a..322fd57a3 100644 --- a/test/stderr/0575 +++ b/test/stderr/0575 @@ -23,6 +23,8 @@ host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<x@y> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<x@y> processing "accept" diff --git a/test/stderr/2202 b/test/stderr/2202 index dbca98bdd..3c889f02e 100644 --- a/test/stderr/2202 +++ b/test/stderr/2202 @@ -23,6 +23,8 @@ host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<xx@cioce.test.again.dns> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<a@b> using ACL "rcpt" diff --git a/test/stderr/2600 b/test/stderr/2600 index 62b96aaef..638e5c6e2 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -132,6 +132,8 @@ host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<a@b> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<c@d> using ACL "check_recipient" @@ -226,6 +228,8 @@ host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<a@b> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 SMTP>> 250 OK SMTP<< rcpt to:<c@d> using ACL "check_recipient" @@ -295,6 +299,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@myhost.test.ex> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 Sender: CALLER@myhost.test.ex Recipients: userx diff --git a/test/stderr/5004 b/test/stderr/5004 index 4730672b5..db77fe96a 100644 --- a/test/stderr/5004 +++ b/test/stderr/5004 @@ -13,6 +13,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 Sender: CALLER@test.ex Recipients: userx@test.ex diff --git a/test/stderr/5005 b/test/stderr/5005 index b25c6c5be..5e31754a5 100644 --- a/test/stderr/5005 +++ b/test/stderr/5005 @@ -11,6 +11,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 Sender: CALLER@test.ex Recipients: nofile@test.ex @@ -198,6 +200,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 Sender: CALLER@test.ex Recipients: userx@test.ex @@ -385,6 +389,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 Sender: CALLER@test.ex Recipients: userx@test.ex @@ -581,6 +587,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 Sender: CALLER@test.ex Recipients: userx@test.ex diff --git a/test/stderr/5006 b/test/stderr/5006 index 9dd41c8e8..16d1e57dc 100644 --- a/test/stderr/5006 +++ b/test/stderr/5006 @@ -11,6 +11,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 +log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 Sender: CALLER@test.ex Recipients: userx@test.ex |