From: Wietse Venema Date: Mon, 11 Feb 2013 05:00:00 +0000 (-0500) Subject: postfix-2.10.0 X-Git-Tag: v2.10.0^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b45a886ba716ee45a7863161bdfebf26f5103431;p=thirdparty%2Fpostfix.git postfix-2.10.0 --- diff --git a/postfix/HISTORY b/postfix/HISTORY index b3b1a2834..1793ebebb 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -18242,3 +18242,8 @@ Apologies for any names omitted. = yes" if you need backwards compatibility. Fix by Victor Duchovni, BC added by Wietse. Files: tls/tls_verify.c, tls/tls_misc.c, proto/TLS_README.html, global/mail_params.h. + +20130210 + + Bugfix: an error handler for smtp_tls_policy_maps lookups + was never invoked. File: smtp/smtp_session.c. diff --git a/postfix/README_FILES/INSTALL b/postfix/README_FILES/INSTALL index 05c7283ec..2ab58b4e9 100644 --- a/postfix/README_FILES/INSTALL +++ b/postfix/README_FILES/INSTALL @@ -43,7 +43,7 @@ should be executed as the superuser. A command written as - % command + $ command should be executed as an unprivileged user. @@ -58,14 +58,14 @@ because the files use backspace characters in order to produce bboolldd font print a README file without backspace characters, use the col(1) command. For example: - % col -bx 
-% command
+$ command
@@ -110,7 +110,7 @@ characters, use the col(1) command. For example: 

-% col -bx <file | lpr
+$ col -bx <file | lpr
@@ -120,8 +120,8 @@ be sure to use an absolute path. 

-% export MANPATH; MANPATH="`pwd`/man:$MANPATH"
-% setenv MANPATH "`pwd`/man:$MANPATH"
+$ export MANPATH; MANPATH="`pwd`/man:$MANPATH"
+$ setenv MANPATH "`pwd`/man:$MANPATH"
@@ -141,22 +141,20 @@ mantools directory.

AIX 3.2.5, 4.1.x, 4.2.0, 4.3.x, 5.2
BSD/OS 2.x, 3.x, 4.x
-Darwin 1.x
-FreeBSD 2.x, 3.x, 4.x, 5.x
+FreeBSD 2.x .. 9.x
HP-UX 9.x, 10.x, 11.x
IRIX 5.x, 6.x
-Linux Debian 1.3.1, 2.x, 3.x
-Linux RedHat 3.x (January 2004) - 9.x
-Linux Slackware 3.x, 4.x, 7.x
-Linux SuSE 5.x, 6.x, 7.x
-Linux Ubuntu 4.10..7.04
+Linux Debian 1.3.1 and later
+Linux RedHat 3.x (January 2004) and later
+Linux Slackware 3.x and later
+Linux SuSE 5.x and later
+Linux Ubuntu 4.10 and later
Mac OS X
NEXTSTEP 3.x
-NetBSD 1.x
+NetBSD 1.x and later
OPENSTEP 4.x
OSF1.V3 - OSF1.V5 (Digital UNIX)
Reliant UNIX 5.x
-Rhapsody 5.x
SunOS 4.1.4 (March 2007)
SunOS 5.4 - 5.10 (Solaris 2.4..10)
Ultrix 4.x (well, that was long ago)
@@ -184,7 +182,7 @@ the following command from the Postfix top-level directory: 

-% make -f Makefile.init makefiles
+$ make -f Makefile.init makefiles
@@ -194,7 +192,7 @@ first do this:

-% make tidy
+$ make tidy
@@ -209,7 +207,7 @@ directory of the source tree and type: 

-% make
+$ make
@@ -218,14 +216,14 @@ of the compiler. Here are a few examples: 

-% make makefiles CC=/opt/SUNWspro/bin/cc        (Solaris)
-% make
+$ make makefiles CC=/opt/SUNWspro/bin/cc        (Solaris)
+$ make
 
-% make makefiles CC="/opt/ansic/bin/cc -Ae"     (HP-UX)
-% make
+$ make makefiles CC="/opt/ansic/bin/cc -Ae"     (HP-UX)
+$ make
 
-% make makefiles CC="purify cc"
-% make
+$ make makefiles CC="purify cc"
+$ make
@@ -285,8 +283,8 @@ use: 

-% make makefiles CCARGS='-DDEF_CONFIG_DIR=\"/some/where\"'
-% make
+$ make makefiles CCARGS='-DDEF_CONFIG_DIR=\"/some/where\"'
+$ make
@@ -349,8 +347,8 @@ is as follows: 

-% make makefiles name=value name=value...
-% make
+$ make makefiles name=value name=value...
+$ make
@@ -460,7 +458,7 @@ macro to make select() work correctly: 

-% make makefiles CCARGS=-DFD_SETSIZE=2048
+$ make makefiles CCARGS=-DFD_SETSIZE=2048
@@ -482,7 +480,7 @@ number of open sockets or files. 

-% make
+$ make
@@ -693,7 +691,7 @@ file. 

-% egrep '(reject|warning|error|fatal|panic):' /some/log/file
+$ egrep '(reject|warning|error|fatal|panic):' /some/log/file
@@ -705,11 +703,11 @@ commands: 

-% mailq
+$ mailq
 
-% sendmail -bp
+$ sendmail -bp
 
-% postqueue -p
+$ postqueue -p
@@ -774,7 +772,7 @@ file. 

-% egrep '(reject|warning|error|fatal|panic):' /some/log/file
+$ egrep '(reject|warning|error|fatal|panic):' /some/log/file
@@ -786,11 +784,11 @@ commands: 

-% mailq
+$ mailq
 
-% sendmail -bp
+$ sendmail -bp
 
-% postqueue -p
+$ postqueue -p
@@ -839,7 +837,7 @@ file. 

-% egrep '(reject|warning|error|fatal|panic):' /some/log/file
+$ egrep '(reject|warning|error|fatal|panic):' /some/log/file
@@ -851,11 +849,11 @@ commands: 

-% mailq
+$ mailq
 
-% sendmail -bp
+$ sendmail -bp
 
-% postqueue -p
+$ postqueue -p
diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html index 6a23f9ba2..0a8a9cf91 100644 --- a/postfix/html/postconf.5.html +++ b/postfix/html/postconf.5.html @@ -11077,7 +11077,7 @@ $ openssl x509 -in cert.pem -noout -pubkey |

The Postfix SMTP server and client log the peer (leaf) certificate -fingerprint and public key fingerprint when TLS loglevel is 1 or +fingerprint and public key fingerprint when the TLS loglevel is 2 or higher.

Note: Postfix 2.9.0–2.9.5 computed the public key @@ -15051,7 +15051,7 @@ $ openssl x509 -in cert.pem -noout -pubkey |

The Postfix SMTP server and client log the peer (leaf) certificate -fingerprint and public key fingerprint when TLS loglevel is 1 or +fingerprint and public key fingerprint when the TLS loglevel is 2 or higher.

Note: Postfix 2.9.0–2.9.5 computed the public key diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5 index d2f6a7f1b..9e1b3e9bb 100644 --- a/postfix/man/man5/postconf.5 +++ b/postfix/man/man5/postconf.5 @@ -6890,7 +6890,7 @@ $ openssl x509 -in cert.pem -noout -pubkey | .in -4 .PP The Postfix SMTP server and client log the peer (leaf) certificate -fingerprint and public key fingerprint when TLS loglevel is 1 or +fingerprint and public key fingerprint when the TLS loglevel is 2 or higher. .PP \fBNote:\fR Postfix 2.9.0–2.9.5 computed the public key @@ -10118,7 +10118,7 @@ $ openssl x509 -in cert.pem -noout -pubkey | .in -4 .PP The Postfix SMTP server and client log the peer (leaf) certificate -fingerprint and public key fingerprint when TLS loglevel is 1 or +fingerprint and public key fingerprint when the TLS loglevel is 2 or higher. .PP \fBNote:\fR Postfix 2.9.0–2.9.5 computed the public key diff --git a/postfix/proto/INSTALL.html b/postfix/proto/INSTALL.html index 9df6d4d92..6e26141a0 100644 --- a/postfix/proto/INSTALL.html +++ b/postfix/proto/INSTALL.html @@ -91,7 +91,7 @@ receive mail via virtual interface 

-% command
+$ command
@@ -110,7 +110,7 @@ characters, use the col(1) command. For example: 

-% col -bx <file | lpr
+$ col -bx <file | lpr
@@ -120,8 +120,8 @@ be sure to use an absolute path. 

-% export MANPATH; MANPATH="`pwd`/man:$MANPATH"
-% setenv MANPATH "`pwd`/man:$MANPATH"
+$ export MANPATH; MANPATH="`pwd`/man:$MANPATH"
+$ setenv MANPATH "`pwd`/man:$MANPATH"
@@ -141,22 +141,20 @@ mantools directory.

AIX 3.2.5, 4.1.x, 4.2.0, 4.3.x, 5.2
BSD/OS 2.x, 3.x, 4.x
-Darwin 1.x
-FreeBSD 2.x, 3.x, 4.x, 5.x
+FreeBSD 2.x .. 9.x
HP-UX 9.x, 10.x, 11.x
IRIX 5.x, 6.x
-Linux Debian 1.3.1, 2.x, 3.x
-Linux RedHat 3.x (January 2004) - 9.x
-Linux Slackware 3.x, 4.x, 7.x
-Linux SuSE 5.x, 6.x, 7.x
-Linux Ubuntu 4.10..7.04
+Linux Debian 1.3.1 and later
+Linux RedHat 3.x (January 2004) and later
+Linux Slackware 3.x and later
+Linux SuSE 5.x and later
+Linux Ubuntu 4.10 and later
Mac OS X
NEXTSTEP 3.x
-NetBSD 1.x
+NetBSD 1.x and later
OPENSTEP 4.x
OSF1.V3 - OSF1.V5 (Digital UNIX)
Reliant UNIX 5.x
-Rhapsody 5.x
SunOS 4.1.4 (March 2007)
SunOS 5.4 - 5.10 (Solaris 2.4..10)
Ultrix 4.x (well, that was long ago)
@@ -184,7 +182,7 @@ the following command from the Postfix top-level directory: 

-% make -f Makefile.init makefiles
+$ make -f Makefile.init makefiles
@@ -194,7 +192,7 @@ first do this:

-% make tidy
+$ make tidy
@@ -209,7 +207,7 @@ directory of the source tree and type: 

-% make
+$ make
@@ -218,14 +216,14 @@ of the compiler. Here are a few examples: 

-% make makefiles CC=/opt/SUNWspro/bin/cc        (Solaris)
-% make
+$ make makefiles CC=/opt/SUNWspro/bin/cc        (Solaris)
+$ make
 
-% make makefiles CC="/opt/ansic/bin/cc -Ae"     (HP-UX)
-% make
+$ make makefiles CC="/opt/ansic/bin/cc -Ae"     (HP-UX)
+$ make
 
-% make makefiles CC="purify cc"
-% make
+$ make makefiles CC="purify cc"
+$ make
@@ -285,8 +283,8 @@ use: 

-% make makefiles CCARGS='-DDEF_CONFIG_DIR=\"/some/where\"'
-% make
+$ make makefiles CCARGS='-DDEF_CONFIG_DIR=\"/some/where\"'
+$ make
@@ -349,8 +347,8 @@ is as follows: 

-% make makefiles name=value name=value...
-% make
+$ make makefiles name=value name=value...
+$ make
@@ -460,7 +458,7 @@ macro to make select() work correctly: 

-% make makefiles CCARGS=-DFD_SETSIZE=2048
+$ make makefiles CCARGS=-DFD_SETSIZE=2048
@@ -482,7 +480,7 @@ number of open sockets or files. 

-% make
+$ make
@@ -693,7 +691,7 @@ file. 

-% egrep '(reject|warning|error|fatal|panic):' /some/log/file
+$ egrep '(reject|warning|error|fatal|panic):' /some/log/file
@@ -705,11 +703,11 @@ commands: 

-% mailq
+$ mailq
 
-% sendmail -bp
+$ sendmail -bp
 
-% postqueue -p
+$ postqueue -p
@@ -774,7 +772,7 @@ file. 

-% egrep '(reject|warning|error|fatal|panic):' /some/log/file
+$ egrep '(reject|warning|error|fatal|panic):' /some/log/file
@@ -786,11 +784,11 @@ commands: 

-% mailq
+$ mailq
 
-% sendmail -bp
+$ sendmail -bp
 
-% postqueue -p
+$ postqueue -p
@@ -839,7 +837,7 @@ file. 

-% egrep '(reject|warning|error|fatal|panic):' /some/log/file
+$ egrep '(reject|warning|error|fatal|panic):' /some/log/file
@@ -851,11 +849,11 @@ commands: 

-% mailq
+$ mailq
 
-% sendmail -bp
+$ sendmail -bp
 
-% postqueue -p
+$ postqueue -p
diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto index f88654b38..18d27d10f 100644 --- a/postfix/proto/postconf.proto +++ b/postfix/proto/postconf.proto @@ -11728,7 +11728,7 @@ $ openssl x509 -in cert.pem -noout -pubkey |

The Postfix SMTP server and client log the peer (leaf) certificate -fingerprint and public key fingerprint when TLS loglevel is 1 or +fingerprint and public key fingerprint when the TLS loglevel is 2 or higher.

Note: Postfix 2.9.0–2.9.5 computed the public key @@ -11882,7 +11882,7 @@ $ openssl x509 -in cert.pem -noout -pubkey |

The Postfix SMTP server and client log the peer (leaf) certificate -fingerprint and public key fingerprint when TLS loglevel is 1 or +fingerprint and public key fingerprint when the TLS loglevel is 2 or higher.

Note: Postfix 2.9.0–2.9.5 computed the public key diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index ae2b38692..6564ffb78 100644 --- a/postfix/src/global/mail_version.h +++ b/postfix/src/global/mail_version.h @@ -20,8 +20,8 @@ * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ -#define MAIL_RELEASE_DATE "20130204" -#define MAIL_VERSION_NUMBER "2.10-RC1" +#define MAIL_RELEASE_DATE "20130211" +#define MAIL_VERSION_NUMBER "2.10.0" #ifdef SNAPSHOT # define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE diff --git a/postfix/src/smtp/smtp_session.c b/postfix/src/smtp/smtp_session.c index e98695450..e476ee07b 100644 --- a/postfix/src/smtp/smtp_session.c +++ b/postfix/src/smtp/smtp_session.c @@ -220,14 +220,14 @@ static int tls_policy_lookup_one(SMTP_SESSION *session, int *site_level, #undef FREE_RETURN #define FREE_RETURN(x) do { myfree(saved_policy); return (x); } while (0) - if ((lookup = maps_find(tls_policy, site_name, 0)) == 0) + if ((lookup = maps_find(tls_policy, site_name, 0)) == 0) { + if (tls_policy->error) { + msg_fatal("%s: %s lookup error for %s", + session->state->request->queue_id, + tls_policy->title, site_name); + /* XXX session->stream has no longjmp context yet. */ + } return (0); - - if (tls_policy->error) { - msg_warn("%s: %s lookup error for %s", - session->state->request->queue_id, - tls_policy->title, site_name); - vstream_longjmp(session->stream, SMTP_ERR_DATA); } if (cbuf == 0) cbuf = vstring_alloc(10);