diff --git a/postfix/HISTORY b/postfix/HISTORY index d627a1b85..fa4ceb911 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -3758,7 +3758,7 @@ Apologies for any names omitted. a file descriptor into its child process, and requires that sendmail closes the descriptor, otherwise mail notification will hang. These GUI programmers never figured out that - the child process must close the writing ed of a pipe. + the child process must close the writing end of a pipe. File: sendmail/sendmail.c. 20000314 @@ -3773,3 +3773,24 @@ Apologies for any names omitted. Workaround: added -blibpath option for AIX 4.x, to close hole in case postdrop needs to be set-gid. + +20000320 + + Portability: FreeBSD 5.x added to the list of supported + systems (Mark Huizer). + +20000323 + + Portability: INSTALL.sh looks if sendmail is in /usr/lib + rather than in /usr/sbin. + +20000326 + + Bugfix: settings in one mysql configuration file would act + as the implicit defaults for the next one, which could be + confusing. Patch by Scott Cotton. File: util/dict_mysql.c. + + Robustness: limit the number of "junk" commands that can + be issued in an SMTP session (ex.: NOOP, VRFY, ETRN, RSET). + Problem report by Michael Ju. Tokarev @ tls.msk.ru. Files: + global/mail_params.h, smtpd/smtpd.c. diff --git a/postfix/INSTALL b/postfix/INSTALL index 1277b79dc..560a23f96 100644 --- a/postfix/INSTALL +++ b/postfix/INSTALL @@ -55,6 +55,7 @@ If your system is supported, it is one of FreeBSD 2.x FreeBSD 3.x FreeBSD 4.x + FreeBSD 5.x HP-UX 9.x HP-UX 10.x HP-UX 11.x @@ -86,6 +87,10 @@ If your system is supported, it is one of or something closely resemblant. +On Solaris, the "make" command and other utilities for software +development are in /usr/ccs/bin, so you MUST have /usr/ccs/bin +in your command search path. + If at any time in the build process you get messages like: "make: don't know how to ..." you should be able to recover by running the following command from the Postfix top-level directory: diff --git a/postfix/INSTALL.sh b/postfix/INSTALL.sh index a2678419a..9ee2aff27 100644 --- a/postfix/INSTALL.sh +++ b/postfix/INSTALL.sh @@ -47,6 +47,7 @@ EOF compare_or_replace() { cmp $2 $3 >/dev/null 2>&1 || { + echo Updating $3... rm -f $tempdir/junk || exit 1 cp $2 $tempdir/junk || exit 1 chmod $1 $tempdir/junk || exit 1 @@ -57,6 +58,7 @@ compare_or_replace() { compare_or_symlink() { cmp $1 $2 >/dev/null 2>&1 || { + echo Updating $2... rm -f $tempdir/junk || exit 1 dest=`echo $1 | sed ' s;^'$install_root';; @@ -85,6 +87,7 @@ compare_or_symlink() { compare_or_move() { cmp $2 $3 >/dev/null 2>&1 || { + echo Updating $3... mv -f $2 $3 || exit 1 chmod $1 $3 || exit 1 } @@ -105,7 +108,10 @@ config_directory=/etc/postfix daemon_directory=/usr/libexec/postfix command_directory=/usr/sbin queue_directory=/var/spool/postfix -sendmail_path=/usr/sbin/sendmail +if [ -f /usr/lib/sendmail ] + then sendmail_path=/usr/lib/sendmail + else sendmail_path=/usr/sbin/sendmail +fi newaliases_path=/usr/bin/newaliases mailq_path=/usr/bin/mailq mail_owner=postfix @@ -329,6 +335,7 @@ no) ;; for file in man?/* do (test -f $MANPAGES/$file && cmp -s $file $MANPAGES/$file) || { + echo Updating $MANPAGES/$file... rm -f $MANPAGES/$file cp $file $MANPAGES/$file || exit 1 chmod 644 $MANPAGES/$file || exit 1 diff --git a/postfix/RELEASE_NOTES b/postfix/RELEASE_NOTES index bdcdaedc4..ee2a5ec54 100644 --- a/postfix/RELEASE_NOTES +++ b/postfix/RELEASE_NOTES @@ -1,13 +1,10 @@ Incompatible changes with snapshot-20000309 =========================================== -This release is mainly to have a reference point after reorganizing -the cleanup daemon, and before adding some major contributions from -other people. - -The sendmail command now treats a `.' line as end of input, for -the sake of compatibility. To revert to past behavior, specify the -`-i' or `-oi' command-line flags. +The Postfix sendmail command now treats a line with only `.' as +the end of input, for the sake of sendmail compatibility. To disable +this feature, specify the sendmail-compatible `-i' or `-oi' flags +on the sendmail command line. Major changes with snapshot-20000309 ==================================== diff --git a/postfix/SASL_README b/postfix/SASL_README index de366bc49..8f72505c4 100644 --- a/postfix/SASL_README +++ b/postfix/SASL_README @@ -19,6 +19,10 @@ from: Other SASL libraries may require some changes. All the library specific code is in smtp_sasl_glue.c and in smtpd_sasl_glue.c. +IMPORTANT: if you install the sasl libraries as per the default, +you will have to symlink /usr/lib/sasl -> /usr/local/lib/sasl. +This is not my idea - complain to the sasl people. + Building Postfix with SASL authentication support ================================================= @@ -48,7 +52,7 @@ mechanisms the server will support, for example: pwcheck_method: {PAM, kerberos_v4, passwd, shadow, sasldb} -/etc/sasldb is a db (dbm) database. IN order to make all this work +/etc/sasldb is a db (dbm) database. In order to make all this work with chrooted operation, you may have to copy files into chroot jail: password files, PAM libraries, etc. diff --git a/postfix/cleanup/cleanup_message.c b/postfix/cleanup/cleanup_message.c index 2c6276357..c9a48f11c 100644 --- a/postfix/cleanup/cleanup_message.c +++ b/postfix/cleanup/cleanup_message.c @@ -375,22 +375,6 @@ static void cleanup_missing_headers(CLEANUP_STATE *state) state->resent, vstring_str(state->temp1)); } } -#ifdef USE_AUTH - /* - * Add client and sender identity headers if configured - */ - if (cleanup_auth_client_identity && *var_cleanup_auth_client_header) { - cleanup_out_format(REC_TYPE_NORM, "%s %s@%s", - var_cleanup_auth_client_header, - cleanup_auth_client_identity, - var_cleanup_auth_client_header_domain); - } - if (cleanup_auth_sender_identity && *var_cleanup_auth_sender_header) { - cleanup_out_format(REC_TYPE_NORM, "%s %s", - var_cleanup_auth_sender_header, - cleanup_auth_sender_identity); - } -#endif } /* cleanup_message - initialize message content segment */ diff --git a/postfix/examples/chroot-setup/AIX42 b/postfix/examples/chroot-setup/AIX42 index 4562d4809..41f15b536 100644 --- a/postfix/examples/chroot-setup/AIX42 +++ b/postfix/examples/chroot-setup/AIX42 @@ -1,3 +1,4 @@ +umask 022 mkdir /var/spool/postfix/etc chmod 755 /var/spool/postfix/etc for i in /etc/environment /etc/netsvc.conf /etc/localtime diff --git a/postfix/examples/chroot-setup/BSDI2 b/postfix/examples/chroot-setup/BSDI2 index c3be02132..9d7f020db 100644 --- a/postfix/examples/chroot-setup/BSDI2 +++ b/postfix/examples/chroot-setup/BSDI2 @@ -1,3 +1,4 @@ +umask 022 mkdir /var/spool/postfix/etc chmod 755 /var/spool/postfix/etc cp /etc/localtime /etc/services /etc/resolv.conf /var/spool/postfix/etc diff --git a/postfix/examples/chroot-setup/BSDI3 b/postfix/examples/chroot-setup/BSDI3 index c3be02132..9d7f020db 100644 --- a/postfix/examples/chroot-setup/BSDI3 +++ b/postfix/examples/chroot-setup/BSDI3 @@ -1,3 +1,4 @@ +umask 022 mkdir /var/spool/postfix/etc chmod 755 /var/spool/postfix/etc cp /etc/localtime /etc/services /etc/resolv.conf /var/spool/postfix/etc diff --git a/postfix/examples/chroot-setup/FREEBSD3 b/postfix/examples/chroot-setup/FREEBSD3 index 5c81341ac..4afb0eb63 100644 --- a/postfix/examples/chroot-setup/FREEBSD3 +++ b/postfix/examples/chroot-setup/FREEBSD3 @@ -1,3 +1,4 @@ +umask 022 mkdir /var/spool/postfix/etc chmod 755 /var/spool/postfix/etc cd /etc ; cp host.conf localtime services resolv.conf /var/spool/postfix/etc diff --git a/postfix/examples/chroot-setup/FreeBSD2 b/postfix/examples/chroot-setup/FreeBSD2 index 5c81341ac..4afb0eb63 100644 --- a/postfix/examples/chroot-setup/FreeBSD2 +++ b/postfix/examples/chroot-setup/FreeBSD2 @@ -1,3 +1,4 @@ +umask 022 mkdir /var/spool/postfix/etc chmod 755 /var/spool/postfix/etc cd /etc ; cp host.conf localtime services resolv.conf /var/spool/postfix/etc diff --git a/postfix/examples/chroot-setup/NETBSD1 b/postfix/examples/chroot-setup/NETBSD1 index 534076787..53a236116 100644 --- a/postfix/examples/chroot-setup/NETBSD1 +++ b/postfix/examples/chroot-setup/NETBSD1 @@ -1,3 +1,4 @@ +umask 022 mkdir /var/spool/postfix/etc chmod 755 /var/spool/postfix/etc cd /etc ; cp localtime services resolv.conf /var/spool/postfix/etc diff --git a/postfix/examples/chroot-setup/Solaris2 b/postfix/examples/chroot-setup/Solaris2 index 9aca6d1f7..2508f73ab 100644 --- a/postfix/examples/chroot-setup/Solaris2 +++ b/postfix/examples/chroot-setup/Solaris2 @@ -1,5 +1,6 @@ #!/bin/sh +umask 022 PATH=/usr/bin:/sbin:/usr/sbin # Create chroot'd area under Solaris 2.5.1 for postfix. diff --git a/postfix/global/mail_params.h b/postfix/global/mail_params.h index aaf7468c0..ef11be582 100644 --- a/postfix/global/mail_params.h +++ b/postfix/global/mail_params.h @@ -631,11 +631,13 @@ extern int var_smtpd_hard_erlim; #define DEF_SMTPD_ERR_SLEEP 5 extern int var_smtpd_err_sleep; +#define VAR_SMTPD_JUNK_CMD "smtpd_junk_command_limit" +#define DEF_SMTPD_JUNK_CMD 1000 +extern int var_smtpd_junk_cmd_limit; + /* * SASL authentication support. */ -#ifdef USE_SASL_AUTH - #define VAR_SMTPD_SASL_ENABLE "smtpd_sasl_auth_enable" #define DEF_SMTPD_SASL_ENABLE 0 extern bool var_smtpd_sasl_enable; @@ -650,8 +652,6 @@ extern char *var_smtp_sasl_pwd_maps; #define PERMIT_SASL_AUTH "permit_sasl_authenticated" -#endif - /* * Cleanup service. Header info that exceeds $header_size_limit bytes forces * the start of the message body. diff --git a/postfix/global/mail_version.h b/postfix/global/mail_version.h index 60a9586e9..fd4d91123 100644 --- a/postfix/global/mail_version.h +++ b/postfix/global/mail_version.h @@ -15,7 +15,7 @@ * Version of this program. */ #define VAR_MAIL_VERSION "mail_version" -#define DEF_MAIL_VERSION "Snapshot-20000316" +#define DEF_MAIL_VERSION "Snapshot-20000330" extern char *var_mail_version; /* LICENSE diff --git a/postfix/html/faq.html b/postfix/html/faq.html index bff21f6ff..3e12bb83d 100644 --- a/postfix/html/faq.html +++ b/postfix/html/faq.html @@ -99,6 +99,8 @@ distribution list