Postfix version 2.0 patchlevel 8 adds safety mechanisms for problems
that happen rarely, but that can have puzzling effects.
- Too many people mess up their net/mask patterns, causing open
mail relay problems. Postfix processes now abort when given a
net/mask pattern with a non-zero host portion (for example,
168.100.189.2/28), and suggest to specify the proper net/mask
pattern instead (for example, 168.100.189.0/28).
- Workaround for file system clock drift that caused Postfix to
ignore new mail (this could happen with file systems mounted from
a server). Postfix now logs a warning and proceeds with only
slightly reduced performance, instead of ignoring new mail.
Prereq: "2.0.7"
diff -cr /tmp/postfix-2.0.7/src/global/mail_version.h ./src/global/mail_version.h
*** /tmp/postfix-2.0.7/src/global/mail_version.h Wed Mar 19 10:26:08 2003
--- ./src/global/mail_version.h Tue Apr 15 15:17:20 2003
***************
*** 20,29 ****
* Patches change the patchlevel and the release date. Snapshots change the
* release date only, unless they include the same bugfix as a patch release.
*/
! #define MAIL_RELEASE_DATE "20030319"
#define VAR_MAIL_VERSION "mail_version"
! #define DEF_MAIL_VERSION "2.0.7"
extern char *var_mail_version;
/*
--- 20,29 ----
* Patches change the patchlevel and the release date. Snapshots change the
* release date only, unless they include the same bugfix as a patch release.
*/
! #define MAIL_RELEASE_DATE "20030415"
#define VAR_MAIL_VERSION "mail_version"
! #define DEF_MAIL_VERSION "2.0.8"
extern char *var_mail_version;
/*
diff -cr /tmp/postfix-2.0.7/HISTORY ./HISTORY
*** /tmp/postfix-2.0.7/HISTORY Wed Mar 19 20:35:59 2003
--- ./HISTORY Tue Apr 15 15:20:56 2003
***************
*** 7700,7706 ****
--- 7700,7728 ----
for non-existent addresses. This required re-architecting
the recipient table lookup code. File: smtpd/smtpd_check.c.
+ 20030410
+
+ Safety: log a fatal error when a net/mask pattern has a
+ non-zero host part, so that mail delivery is deferred.
+ File: util/match_ops.c.
+
+ 20030411
+
+ Bugfix: extraneous warning about out-of-order original
+ recipient records by Patrik Rak. Files: *qmgr/qmgr_message.c.
+
+ 10030415
+
+ Workaround: log a warning and reset incoming queue file
+ time stamps when the file system clock is ahead of the
+ local clock, instead of ignoring new mail until the next
+ queue scan. The file system clock drift detection executes
+ only once per process instance, to minimize the performance
+ impact. File: global/mail_stream.c.
+
Open problems:
+
+ Low: smtp-source may block when sending large test messages.
Low: after successful delivery, per-queue window += 1/window,
after failure, queue window -= 1 (Victor).
diff -cr /tmp/postfix-2.0.7/INSTALL ./INSTALL
*** /tmp/postfix-2.0.7/INSTALL Sat Dec 21 16:52:52 2002
--- ./INSTALL Mon Apr 14 15:00:25 2003
***************
*** 144,158 ****
Be sure to get the quotes right. These details matter a lot.
! Other parameters whose defaults can be specified in this way are:
! Macro name default value for
! -------------------------------------
! DEF_COMMAND_DIR command_directory
! DEF_DAEMON_DIR daemon_directory
! DEF_SENDMAIL_PATH sendmail_path
! DEF_MAILQ_PATH mailq_path
! DEF_NEWALIAS_PATH newaliases_path
In order to build Postfix for very large applications, where you
expect to run more than 1000 delivery processes, you may need to
--- 144,162 ----
Be sure to get the quotes right. These details matter a lot.
! Parameters whose defaults can be specified in this way are:
! Macro name default value for typical default
! -----------------------------------------------------------
! DEF_COMMAND_DIR command_directory /usr/sbin
! DEF_CONFIG_DIR config_directory /etc/postfix
! DEF_DAEMON_DIR daemon_directory /usr/libexec/postfix
! DEF_MAILQ_PATH mailq_path /usr/bin/mailq
! DEF_MANPAGE_DIR manpage_directory /usr/local/man
! DEF_NEWALIAS_PATH newaliases_path /usr/bin/newaliases
! DEF_README_DIR readme_directory no (do not install)
! DEF_SAMPLE_DIR sample_directory /etc/postfix
! DEF_SENDMAIL_PATH sendmail_path /usr/sbin/sendmail
In order to build Postfix for very large applications, where you
expect to run more than 1000 delivery processes, you may need to
diff -cr /tmp/postfix-2.0.7/RELEASE_NOTES ./RELEASE_NOTES
*** /tmp/postfix-2.0.7/RELEASE_NOTES Wed Mar 5 21:29:35 2003
--- ./RELEASE_NOTES Tue Apr 15 13:41:55 2003
***************
*** 24,29 ****
--- 24,46 ----
date. Snapshots change only the release date, unless they include
the same bugfixes as a patch release.
+ Incompatible changes with Postfix version 2.0.8 (released 20030415)
+ ===================================================================
+
+ Too many people mess up their net/mask patterns, causing open
+ mail relay problems. Postfix processes now abort when given a
+ net/mask pattern with a non-zero host portion (for example,
+ 168.100.189.2/28), and suggest to specify the proper net/mask
+ pattern instead (for example, 168.100.189.0/28).
+
+ Major changes with Postfix version 2.0.8 (released 20030415)
+ ============================================================
+
+ Workaround for file system clock drift that caused Postfix to ignore
+ new mail (this could happen with file systems mounted from a server).
+ Postfix now logs a warning and proceeds with only slightly reduced
+ performance, instead of ignoring new mail.
+
Incompatible changes with Postfix version 2.0.6 (released 20030305)
===================================================================
diff -cr /tmp/postfix-2.0.7/conf/sample-misc.cf ./conf/sample-misc.cf
*** /tmp/postfix-2.0.7/conf/sample-misc.cf Sun Jan 12 12:10:23 2003
--- ./conf/sample-misc.cf Thu Mar 20 15:51:12 2003
***************
*** 4,9 ****
--- 4,16 ----
# This file contains example settings for miscellaneous Postfix
# configuration parameters.
+ # The allow_min_user parameter specifies whether a recipient address
+ # can have a '-' as the first character. By default, this is not
+ # allowed, to avoid accidents with software that passes email addresses
+ # via the command line.
+ #
+ allow_min_user = no
+
# The always_bcc parameter specifies an optional address that
# receives a copy of each message that enters the Postfix system,
# not including bounces that are generated locally.
diff -cr /tmp/postfix-2.0.7/html/basic.html ./html/basic.html
*** /tmp/postfix-2.0.7/html/basic.html Mon Dec 2 15:47:12 2002
--- ./html/basic.html Sat Mar 29 09:44:25 2003
***************
*** 355,363 ****
<a name="mynetworks"> <h2> My own networks </h2> </a>
The <b>mynetworks</b> parameter lists all networks that this machine
! somehow trusts. This information can be used by the <a href="uce.html">
! anti-UCE</a> features to recognize trusted SMTP clients that are
! allowed to relay mail through Postfix.
<p>
--- 355,364 ----
<a name="mynetworks"> <h2> My own networks </h2> </a>
The <b>mynetworks</b> parameter lists all networks that this machine
! somehow trusts. This information can be used by the <a
! href="uce.html#smtpd_recipient_restrictions"> anti-UCE</a> features
! to recognize trusted SMTP clients that are allowed to relay mail
! through Postfix.
<p>
diff -cr /tmp/postfix-2.0.7/html/virtual.5.html ./html/virtual.5.html
*** /tmp/postfix-2.0.7/html/virtual.5.html Sat Dec 21 16:53:02 2002
--- ./html/virtual.5.html Mon Apr 14 20:20:47 2003
***************
*** 138,146 ****
<i>user2@virtual-alias.domain</i> <i>address2,</i> <i>address3</i>
The <i>virtual-alias.domain</i> <i>anything</i> entry is required for a
! virtual alias domain. Without this entry, mail is rejected
! with "relay access denied", or bounces with "mail loops
! back to myself".
Do not specify virtual alias domain names in the <b>main.cf</b>
<b>mydestination</b> or <b>relay</b><i>_</i><b>domains</b> configuration parameters.
--- 138,146 ----
<i>user2@virtual-alias.domain</i> <i>address2,</i> <i>address3</i>
The <i>virtual-alias.domain</i> <i>anything</i> entry is required for a
! virtual alias domain. <b>Without</b> <b>this</b> <b>entry,</b> <b>mail</b> <b>is</b> <b>rejected</b>
! <b>with</b> <b>"relay</b> <b>access</b> <b>denied",</b> <b>or</b> <b>bounces</b> <b>with</b> <b>"mail</b> <b>loops</b>
! <b>back</b> <b>to</b> <b>myself".</b>
Do not specify virtual alias domain names in the <b>main.cf</b>
<b>mydestination</b> or <b>relay</b><i>_</i><b>domains</b> configuration parameters.
diff -cr /tmp/postfix-2.0.7/man/man5/virtual.5 ./man/man5/virtual.5
*** /tmp/postfix-2.0.7/man/man5/virtual.5 Sat Dec 21 16:53:02 2002
--- ./man/man5/virtual.5 Mon Apr 14 20:20:46 2003
***************
*** 141,149 ****
.fi
.sp
The \fIvirtual-alias.domain anything\fR entry is required for a
! virtual alias domain. Without this entry, mail is rejected
with "relay access denied", or bounces with
! "mail loops back to myself".
Do not specify virtual alias domain names in the \fBmain.cf
mydestination\fR or \fBrelay_domains\fR configuration parameters.
--- 141,149 ----
.fi
.sp
The \fIvirtual-alias.domain anything\fR entry is required for a
! virtual alias domain. \fBWithout this entry, mail is rejected
with "relay access denied", or bounces with
! "mail loops back to myself".\fR
Do not specify virtual alias domain names in the \fBmain.cf
mydestination\fR or \fBrelay_domains\fR configuration parameters.
diff -cr /tmp/postfix-2.0.7/postfix-install ./postfix-install
*** /tmp/postfix-2.0.7/postfix-install Tue Mar 4 10:35:40 2003
--- ./postfix-install Fri Mar 21 14:04:53 2003
***************
*** 81,116 ****
# The built-in default directory name is the current directory.
# This parameter setting is not recorded in the installed main.cf file.
# .IP config_directory
! # The destination directory for Postfix configuration files.
# The built-in default directory name is /etc/postfix.
! # This parameter setting is not recorded in the installed main.cf file.
# .IP daemon_directory
! # The destination directory for Postfix daemon programs. This directory
! # should not be in the command search path of any users.
# The built-in default directory name is /usr/libexec/postfix.
# This parameter setting is recorded in the installed main.cf file.
# .IP command_directory
! # The destination directory for Postfix administrative commands. This
! # directory should be in the command search path of adminstrative users.
! # The built-in default directory name is system dependent.
# This parameter setting is recorded in the installed main.cf file.
# .IP queue_directory
! # The destination directory for Postfix queues.
# The built-in default directory name is /var/spool/postfix.
# This parameter setting is recorded in the installed main.cf file.
# .IP sendmail_path
! # The full destination pathname for the Postfix sendmail command.
# This is the Sendmail-compatible mail posting interface.
# The built-in default pathname is system dependent.
# This parameter setting is recorded in the installed main.cf file.
# .IP newaliases_path
! # The full destination pathname for the Postfix newaliases command.
# This is the Sendmail-compatible command to build alias databases
# for the Postfix local delivery agent.
# The built-in default pathname is system dependent.
# This parameter setting is recorded in the installed main.cf file.
# .IP mailq_path
! # The full destination pathname for the Postfix mailq command.
# This is the Sendmail-compatible command to list the mail queue.
# The built-in default pathname is system dependent.
# This parameter setting is recorded in the installed main.cf file.
--- 81,117 ----
# The built-in default directory name is the current directory.
# This parameter setting is not recorded in the installed main.cf file.
# .IP config_directory
! # The final destination directory for Postfix configuration files.
# The built-in default directory name is /etc/postfix.
! # This parameter setting is not recorded in the installed main.cf file
! # and can be changed only by recompiling Postfix.
# .IP daemon_directory
! # The final destination directory for Postfix daemon programs. This
! # directory should not be in the command search path of any users.
# The built-in default directory name is /usr/libexec/postfix.
# This parameter setting is recorded in the installed main.cf file.
# .IP command_directory
! # The final destination directory for Postfix administrative commands.
! # This directory should be in the command search path of adminstrative
! # users. The built-in default directory name is system dependent.
# This parameter setting is recorded in the installed main.cf file.
# .IP queue_directory
! # The final destination directory for Postfix queues.
# The built-in default directory name is /var/spool/postfix.
# This parameter setting is recorded in the installed main.cf file.
# .IP sendmail_path
! # The final destination pathname for the Postfix sendmail command.
# This is the Sendmail-compatible mail posting interface.
# The built-in default pathname is system dependent.
# This parameter setting is recorded in the installed main.cf file.
# .IP newaliases_path
! # The final destination pathname for the Postfix newaliases command.
# This is the Sendmail-compatible command to build alias databases
# for the Postfix local delivery agent.
# The built-in default pathname is system dependent.
# This parameter setting is recorded in the installed main.cf file.
# .IP mailq_path
! # The final destination pathname for the Postfix mailq command.
# This is the Sendmail-compatible command to list the mail queue.
# The built-in default pathname is system dependent.
# This parameter setting is recorded in the installed main.cf file.
***************
*** 286,315 ****
tempdir_prompt="a directory for scratch files while installing
Postfix. You must have write permission in this directory."
! config_directory_prompt="the destination directory for installed
! Postfix configuration files."
! daemon_directory_prompt="the destination directory for installed
! Postfix daemon programs. This directory should not be in the
! command search path of any users."
!
! command_directory_prompt="the destination directory for installed
! Postfix administrative commands. This directory should be in the
! command search path of adminstrative users."
! queue_directory_prompt="the destination directory for Postfix
queues."
! sendmail_path_prompt="the full destination pathname for the installed
! Postfix sendmail command. This is the Sendmail-compatible mail
! posting interface."
! newaliases_path_prompt="the full destination pathname for the
installed Postfix newaliases command. This is the Sendmail-compatible
command to build alias databases for the Postfix local delivery
agent."
! mailq_path_prompt="the full destination pathname for the installed
Postfix mailq command. This is the Sendmail-compatible mail queue
listing command."
--- 287,316 ----
tempdir_prompt="a directory for scratch files while installing
Postfix. You must have write permission in this directory."
! config_directory_prompt="the final destination directory for
! installed Postfix configuration files."
! daemon_directory_prompt="the final destination directory for
! installed Postfix daemon programs. This directory should not be
! in the command search path of any users."
!
! command_directory_prompt="the final destination directory for
! installed Postfix administrative commands. This directory should
! be in the command search path of adminstrative users."
! queue_directory_prompt="the final destination directory for Postfix
queues."
! sendmail_path_prompt="the final destination pathname for the
! installed Postfix sendmail command. This is the Sendmail-compatible
! mail posting interface."
! newaliases_path_prompt="the final destination pathname for the
installed Postfix newaliases command. This is the Sendmail-compatible
command to build alias databases for the Postfix local delivery
agent."
! mailq_path_prompt="the final destination pathname for the installed
Postfix mailq command. This is the Sendmail-compatible mail queue
listing command."
diff -cr /tmp/postfix-2.0.7/proto/virtual ./proto/virtual
*** /tmp/postfix-2.0.7/proto/virtual Sat Dec 21 16:53:02 2002
--- ./proto/virtual Mon Apr 14 20:19:50 2003
***************
*** 129,137 ****
# .fi
# .sp
# The \fIvirtual-alias.domain anything\fR entry is required for a
! # virtual alias domain. Without this entry, mail is rejected
# with "relay access denied", or bounces with
! # "mail loops back to myself".
#
# Do not specify virtual alias domain names in the \fBmain.cf
# mydestination\fR or \fBrelay_domains\fR configuration parameters.
--- 129,137 ----
# .fi
# .sp
# The \fIvirtual-alias.domain anything\fR entry is required for a
! # virtual alias domain. \fBWithout this entry, mail is rejected
# with "relay access denied", or bounces with
! # "mail loops back to myself".\fR
#
# Do not specify virtual alias domain names in the \fBmain.cf
# mydestination\fR or \fBrelay_domains\fR configuration parameters.
diff -cr /tmp/postfix-2.0.7/src/global/mail_stream.c ./src/global/mail_stream.c
*** /tmp/postfix-2.0.7/src/global/mail_stream.c Wed Aug 14 09:07:55 2002
--- ./src/global/mail_stream.c Tue Apr 15 15:06:28 2003
***************
*** 83,88 ****
--- 83,89 ----
#include <sys/stat.h>
#include <unistd.h>
#include <errno.h>
+ #include <utime.h>
/* Utility library. */
***************
*** 110,118 ****
/* mail_stream_cleanup - clean up after success or failure */
! void mail_stream_cleanup(MAIL_STREAM * info)
{
FREE_AND_WIPE(info->close, info->stream);
FREE_AND_WIPE(myfree, info->id);
FREE_AND_WIPE(myfree, info->class);
FREE_AND_WIPE(myfree, info->service);
--- 111,120 ----
/* mail_stream_cleanup - clean up after success or failure */
! void mail_stream_cleanup(MAIL_STREAM *info)
{
FREE_AND_WIPE(info->close, info->stream);
+ FREE_AND_WIPE(myfree, info->queue);
FREE_AND_WIPE(myfree, info->id);
FREE_AND_WIPE(myfree, info->class);
FREE_AND_WIPE(myfree, info->service);
***************
*** 121,130 ****
/* mail_stream_finish_file - finish file mail stream */
! static int mail_stream_finish_file(MAIL_STREAM * info, VSTRING *unused_why)
{
int status = 0;
static char wakeup[] = {TRIGGER_REQ_WAKEUP};
/*
* Make sure the message makes it to file. Set the execute bit when no
--- 123,139 ----
/* mail_stream_finish_file - finish file mail stream */
! static int mail_stream_finish_file(MAIL_STREAM *info, VSTRING *unused_why)
{
int status = 0;
static char wakeup[] = {TRIGGER_REQ_WAKEUP};
+ struct stat st;
+ time_t now;
+ struct utimbuf tbuf;
+ char *path_to_reset = 0;
+ static int incoming_fs_clock_ok = 0;
+ static int incoming_clock_warned = 0;
+ int check_incoming_fs_clock;
/*
* Make sure the message makes it to file. Set the execute bit when no
***************
*** 137,151 ****
--- 146,195 ----
* as are files with unknown record type codes. Every Postfix queue file
* must end with an explicit END record. Postfix queue files without END
* record are discarded.
+ *
+ * Attempt to detect file system clocks that are ahead of local time, but
+ * don't check the file system clock all the time. The effect of file
+ * system clock drift can be difficult to understand (Postfix ignores new
+ * mail until the next queue run).
+ *
+ * This clock drift detection code may not work with file systems that work
+ * on a local copy of the file and that update the server only after the
+ * file is closed.
*/
+ check_incoming_fs_clock =
+ (!incoming_fs_clock_ok && !strcmp(info->queue, MAIL_QUEUE_INCOMING));
+
if (vstream_fflush(info->stream)
|| fchmod(vstream_fileno(info->stream), 0700 | info->mode)
#ifdef HAS_FSYNC
|| fsync(vstream_fileno(info->stream))
#endif
+ || (check_incoming_fs_clock
+ && fstat(vstream_fileno(info->stream), &st) < 0)
)
status = (errno == EFBIG ? CLEANUP_STAT_SIZE : CLEANUP_STAT_WRITE);
+ #ifdef TEST
+ st.st_mtime += 10;
+ #endif
+
+ /*
+ * Work around file system clocks that are ahead of local time.
+ */
+ if (status == CLEANUP_STAT_OK && check_incoming_fs_clock) {
+ if (st.st_mtime <= time(&now)) {
+ incoming_fs_clock_ok = 1;
+ } else {
+ path_to_reset = mystrdup(VSTREAM_PATH(info->stream));
+ if (incoming_clock_warned == 0) {
+ msg_warn("file system clock is %d seconds ahead of local clock",
+ (int) (st.st_mtime - now));
+ msg_warn("resetting file time stamps - this hurts performance");
+ incoming_clock_warned = 1;
+ }
+ }
+ }
+
/*
* Close the queue file and mark it as closed. Be prepared for
* vstream_fclose() to fail even after vstream_fflush() and fsync()
***************
*** 159,164 ****
--- 203,218 ----
info->stream = 0;
/*
+ * Work around file system clocks that are ahead of local time.
+ */
+ if (path_to_reset != 0) {
+ tbuf.actime = tbuf.modtime = now;
+ if (utime(path_to_reset, &tbuf) < 0 && errno != ENOENT)
+ msg_fatal("%s: update file time stamps: %m", info->id);
+ myfree(path_to_reset);
+ }
+
+ /*
* When all is well, notify the next service that a new message has been
* queued.
*/
***************
*** 174,180 ****
/* mail_stream_finish_ipc - finish IPC mail stream */
! static int mail_stream_finish_ipc(MAIL_STREAM * info, VSTRING *why)
{
int status = CLEANUP_STAT_WRITE;
--- 228,234 ----
/* mail_stream_finish_ipc - finish IPC mail stream */
! static int mail_stream_finish_ipc(MAIL_STREAM *info, VSTRING *why)
{
int status = CLEANUP_STAT_WRITE;
***************
*** 199,205 ****
/* mail_stream_finish - finish action */
! int mail_stream_finish(MAIL_STREAM * info, VSTRING *why)
{
return (info->finish(info, why));
}
--- 253,259 ----
/* mail_stream_finish - finish action */
! int mail_stream_finish(MAIL_STREAM *info, VSTRING *why)
{
return (info->finish(info, why));
}
***************
*** 220,225 ****
--- 274,280 ----
info->stream = stream;
info->finish = mail_stream_finish_file;
info->close = vstream_fclose;
+ info->queue = mystrdup(queue);
info->id = mystrdup(basename(VSTREAM_PATH(stream)));
info->class = mystrdup(class);
info->service = mystrdup(service);
***************
*** 247,252 ****
--- 302,308 ----
info->stream = stream;
info->finish = mail_stream_finish_ipc;
info->close = vstream_fclose;
+ info->queue = 0;
info->id = mystrdup(vstring_str(id_buf));
info->class = 0;
info->service = 0;
***************
*** 297,302 ****
--- 353,359 ----
info->stream = stream;
info->finish = mail_stream_finish_ipc;
info->close = vstream_pclose;
+ info->queue = 0;
info->id = mystrdup(vstring_str(id_buf));
info->class = 0;
info->service = 0;
diff -cr /tmp/postfix-2.0.7/src/global/mail_stream.h ./src/global/mail_stream.h
*** /tmp/postfix-2.0.7/src/global/mail_stream.h Fri Dec 28 13:06:24 2001
--- ./src/global/mail_stream.h Tue Apr 15 14:04:43 2003
***************
*** 27,32 ****
--- 27,33 ----
struct MAIL_STREAM {
VSTREAM *stream; /* file or pipe or socket */
+ char *queue; /* (initial) queue name */
char *id; /* queue id */
MAIL_STREAM_FINISH_FN finish; /* finish code */
MAIL_STREAM_CLOSE_FN close; /* close stream */
diff -cr /tmp/postfix-2.0.7/src/nqmgr/qmgr_message.c ./src/nqmgr/qmgr_message.c
*** /tmp/postfix-2.0.7/src/nqmgr/qmgr_message.c Fri Jan 24 09:48:36 2003
--- ./src/nqmgr/qmgr_message.c Fri Apr 11 09:19:51 2003
***************
*** 397,402 ****
--- 397,403 ----
message->rcpt_unread--;
}
} else if (rec_type == REC_TYPE_RCPT) {
+ /* See also below for code setting orig_rcpt. */
if (message->rcpt_list.len < recipient_limit) {
message->rcpt_unread--;
qmgr_rcpt_list_add(&message->rcpt_list, curr_offset,
***************
*** 467,473 ****
orig_rcpt = 0;
}
if (rec_type == REC_TYPE_ORCP)
! orig_rcpt = mystrdup(start);
} while (rec_type > 0 && rec_type != REC_TYPE_END);
/*
--- 468,476 ----
orig_rcpt = 0;
}
if (rec_type == REC_TYPE_ORCP)
! /* See also above for code clearing orig_rcpt. */
! if (message->rcpt_offset == 0)
! orig_rcpt = mystrdup(start);
} while (rec_type > 0 && rec_type != REC_TYPE_END);
/*
diff -cr /tmp/postfix-2.0.7/src/qmgr/qmgr_message.c ./src/qmgr/qmgr_message.c
*** /tmp/postfix-2.0.7/src/qmgr/qmgr_message.c Fri Jan 24 09:47:48 2003
--- ./src/qmgr/qmgr_message.c Fri Apr 11 09:19:51 2003
***************
*** 273,278 ****
--- 273,279 ----
"queue %s", message->queue_name);
}
} else if (rec_type == REC_TYPE_RCPT) {
+ /* See also below for code setting orig_rcpt. */
#define FUDGE(x) ((x) * (var_qmgr_fudge / 100.0))
if (message->rcpt_list.len < FUDGE(var_qmgr_rcpt_limit)) {
qmgr_rcpt_list_add(&message->rcpt_list, curr_offset,
***************
*** 347,353 ****
orig_rcpt = 0;
}
if (rec_type == REC_TYPE_ORCP)
! orig_rcpt = mystrdup(start);
} while (rec_type > 0 && rec_type != REC_TYPE_END);
/*
--- 348,356 ----
orig_rcpt = 0;
}
if (rec_type == REC_TYPE_ORCP)
! /* See also above for code clearing orig_rcpt. */
! if (message->rcpt_offset == 0)
! orig_rcpt = mystrdup(start);
} while (rec_type > 0 && rec_type != REC_TYPE_END);
/*
diff -cr /tmp/postfix-2.0.7/src/smtpstone/smtp-source.c ./src/smtpstone/smtp-source.c
*** /tmp/postfix-2.0.7/src/smtpstone/smtp-source.c Thu Dec 19 20:33:41 2002
--- ./src/smtpstone/smtp-source.c Mon Mar 24 15:27:09 2003
***************
*** 651,656 ****
--- 651,657 ----
mydate = mail_date(time((time_t *) 0));
mypid = getpid();
}
+ #if SMTP_PRINTF_NO_LONGER_FLUSHES
smtp_printf(session->stream, "From: <%s>", sender);
smtp_printf(session->stream, "To: <%s>", recipient);
smtp_printf(session->stream, "Date: %s", mydate);
***************
*** 658,663 ****
--- 659,674 ----
mypid, vstream_fileno(session->stream), message_count, var_myhostname);
if (subject)
smtp_printf(session->stream, "Subject: %s", subject);
+ #else
+ vstream_fprintf(session->stream, "From: <%s>\r\n", sender);
+ vstream_fprintf(session->stream, "To: <%s>\r\n", recipient);
+ vstream_fprintf(session->stream, "Date: %s\r\n", mydate);
+ vstream_fprintf(session->stream, "Message-Id: <%04x.%04x.%04x@%s>\r\n",
+ mypid, vstream_fileno(session->stream), message_count,
+ var_myhostname);
+ if (subject)
+ vstream_fprintf(session->stream, "Subject: %s\r\n", subject);
+ #endif
smtp_fputs("", 0, session->stream);
}
***************
*** 672,677 ****
--- 683,693 ----
smtp_fputs("La de da de da 3.", 17, session->stream);
smtp_fputs("La de da de da 4.", 17, session->stream);
} else {
+
+ /*
+ * XXX This may cause the process to block with message content
+ * larger than VSTREAM_BUFIZ bytes.
+ */
smtp_fputs(message_data, message_length, session->stream);
}
diff -cr /tmp/postfix-2.0.7/src/util/match_ops.c ./src/util/match_ops.c
*** /tmp/postfix-2.0.7/src/util/match_ops.c Tue Nov 20 15:16:10 2001
--- ./src/util/match_ops.c Mon Apr 14 10:44:19 2003
***************
*** 207,212 ****
--- 207,213 ----
unsigned long mask_bits;
unsigned long net_bits;
unsigned long addr_bits;
+ struct in_addr net_addr;
if (msg_verbose)
msg_info("%s: %s ~? %s", myname, addr, pattern);
***************
*** 242,248 ****
if (addr_bits == INADDR_NONE)
msg_fatal("%s: bad address argument: %s", myname, addr);
mask_bits = htonl((0xffffffff) << (BITS_PER_ADDR - mask_shift));
! return ((addr_bits & mask_bits) == (net_bits & mask_bits));
}
return (0);
}
--- 243,256 ----
if (addr_bits == INADDR_NONE)
msg_fatal("%s: bad address argument: %s", myname, addr);
mask_bits = htonl((0xffffffff) << (BITS_PER_ADDR - mask_shift));
! if ((addr_bits & mask_bits) == net_bits)
! return (1);
! if (net_bits & ~mask_bits) {
! net_addr.s_addr = (net_bits & mask_bits);
! msg_fatal("net/mask pattern %s has a non-null host portion; "
! "specify %s/%d if this is really what you want",
! pattern, inet_ntoa(net_addr), mask_shift);
! }
}
return (0);
}