From 21a6f1f81e02348f45b3e1b4e4ca87c5896981ca Mon Sep 17 00:00:00 2001
From: Wietse Z Venema
Date: Wed, 31 Dec 2025 00:00:00 -0500
Subject: [PATCH] postfix-3.11.0-RC3
---
postfix/HISTORY | 9 ++
postfix/INSTALL | 145 +++++++++++++++---------------
postfix/README_FILES/INSTALL | 145 +++++++++++++++---------------
postfix/RELEASE_NOTES | 27 +++---
postfix/html/INSTALL.html | 21 +++--
postfix/html/postconf.5.html | 11 +--
postfix/man/man5/postconf.5 | 11 +--
postfix/proto/INSTALL.html | 21 +++--
postfix/proto/postconf.proto | 11 +--
postfix/src/global/mail_params.h | 3 -
postfix/src/global/mail_version.h | 4 +-
postfix/src/util/sys_defs.h | 8 ++
12 files changed, 214 insertions(+), 202 deletions(-)
diff --git a/postfix/HISTORY b/postfix/HISTORY
index f77142c02..93eba0284 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -30294,3 +30294,12 @@ Apologies for any names omitted.
global/mail_params.h.
Documentation: updated REQUIRETLS_README.
+
+20251231
+
+ Cleanup: eliminated implicit dependency of default_cache_db_type
+ on $default_database_type. Files: global/mail_params.h,
+ proto/postconf.proto, RELEASE_NOTES-3.11, util/sys_defs.h.
+
+ Documentation: fixed wrong default in INSTALL and postconf(5).
+ Files: proto/INSTALL.html, proto/postconf.proto.
diff --git a/postfix/INSTALL b/postfix/INSTALL
index 9b244119d..4bd762bea 100644
--- a/postfix/INSTALL
+++ b/postfix/INSTALL
@@ -67,18 +67,18 @@ path.
$ export MANPATH; MANPATH="`pwd`/man:$MANPATH"
$ setenv MANPATH "`pwd`/man:$MANPATH"
-Of particular interest is the postconf(5) manual page that lists all the 500+
-configuration parameters. The HTML version of this text makes it easy to
-navigate around.
+Of particular interest is the postconf(5) manual page that lists all the 900+
+configuration parameters. The hyperlinks in the HTML version (html/
+postconf.5.html) make the text easy to navigate.
All Postfix source files have their own built-in manual page. Tools to extract
those embedded manual pages are available in the mantools directory.
4 - Building on a supported system
-Postfix development happens on FreeBSD and MacOS X, with regular tests on Linux
-(Fedora, Ubuntu) and Solaris. Support for other systems relies on feedback from
-their users, and may not always be up-to-date.
+Postfix development happens on FreeBSD and Linux, with occasional tests on
+Solaris. Support for other systems relies on feedback from their users, and may
+not always be up-to-date.
OpenBSD is partially supported. The libc resolver does not implement the
documented "internal resolver options which are [...] set by changing fields in
@@ -425,44 +425,43 @@ Parameters whose defaults can be specified in this way are listed below. See
the postconf(5) manpage for a description (command: "nroff -man man/man5/
postconf.5 | less").
- _______________________________________________________________________
- |parameter name |typical default |
- |_____________________|_________________________________________________|
- |command_directory |/usr/sbin |
- |_____________________|_________________________________________________|
- |config_directory |/etc/postfix |
- |_____________________|_________________________________________________|
- |default_database_type|hash |
- |_____________________|_________________________________________________|
- |default_cache_db_type|(lmdb if default_database_type is lmdb, otherwise|
- | |btree) |
- |_____________________|_________________________________________________|
- |daemon_directory |/usr/libexec/postfix |
- |_____________________|_________________________________________________|
- |data_directory |/var/lib/postfix |
- |_____________________|_________________________________________________|
- |html_directory |no |
- |_____________________|_________________________________________________|
- |mail_spool_directory |/var/mail |
- |_____________________|_________________________________________________|
- |mailq_path |/usr/bin/mailq |
- |_____________________|_________________________________________________|
- |manpage_directory |/usr/local/man |
- |_____________________|_________________________________________________|
- |meta_directory |/etc/postfix |
- |_____________________|_________________________________________________|
- |newaliases_path |/usr/bin/newaliases |
- |_____________________|_________________________________________________|
- |openssl_path |openssl |
- |_____________________|_________________________________________________|
- |queue_directory |/var/spool/postfix |
- |_____________________|_________________________________________________|
- |readme_directory |no |
- |_____________________|_________________________________________________|
- |sendmail_path |/usr/sbin/sendmail |
- |_____________________|_________________________________________________|
- |shlib_directory |/usr/lib/postfix |
- |_____________________|_________________________________________________|
+ __________________________________________
+ |parameter name |typical default |
+ |_____________________|____________________|
+ |command_directory |/usr/sbin |
+ |_____________________|____________________|
+ |config_directory |/etc/postfix |
+ |_____________________|____________________|
+ |default_database_type|lmdb or hash |
+ |_____________________|____________________|
+ |default_cache_db_type|lmdb or btree |
+ |_____________________|____________________|
+ |daemon_directory |/usr/libexec/postfix|
+ |_____________________|____________________|
+ |data_directory |/var/lib/postfix |
+ |_____________________|____________________|
+ |html_directory |no |
+ |_____________________|____________________|
+ |mail_spool_directory |/var/mail |
+ |_____________________|____________________|
+ |mailq_path |/usr/bin/mailq |
+ |_____________________|____________________|
+ |manpage_directory |/usr/local/man |
+ |_____________________|____________________|
+ |meta_directory |/etc/postfix |
+ |_____________________|____________________|
+ |newaliases_path |/usr/bin/newaliases |
+ |_____________________|____________________|
+ |openssl_path |openssl |
+ |_____________________|____________________|
+ |queue_directory |/var/spool/postfix |
+ |_____________________|____________________|
+ |readme_directory |no |
+ |_____________________|____________________|
+ |sendmail_path |/usr/sbin/sendmail |
+ |_____________________|____________________|
+ |shlib_directory |/usr/lib/postfix |
+ |_____________________|____________________|
4.6.2 - All Postfix versions
@@ -480,35 +479,35 @@ Parameters whose defaults can be specified in this way are listed below. See
the postconf(5) manpage for a description (command: "nroff -man man/man5/
postconf.5 | less").
- _________________________________________________________________________
- |Macro name |default value for |typical default |
- |_________________|_____________________|_________________________________|
- |DEF_COMMAND_DIR |command_directory |/usr/sbin |
- |_________________|_____________________|_________________________________|
- |DEF_CONFIG_DIR |config_directory |/etc/postfix |
- |_________________|_____________________|_________________________________|
- |DEF_DB_TYPE |default_database_type|hash |
- |_________________|_____________________|_________________________________|
- |DEF_CACHE_DB_TYPE|default_cache_db_type|hash or lmdb, depends on platform|
- |_________________|_____________________|_________________________________|
- |DEF_DAEMON_DIR |daemon_directory |/usr/libexec/postfix |
- |_________________|_____________________|_________________________________|
- |DEF_DATA_DIR |data_directory |/var/lib/postfix |
- |_________________|_____________________|_________________________________|
- |DEF_MAILQ_PATH |mailq_path |/usr/bin/mailq |
- |_________________|_____________________|_________________________________|
- |DEF_HTML_DIR |html_directory |no |
- |_________________|_____________________|_________________________________|
- |DEF_MANPAGE_DIR |manpage_directory |/usr/local/man |
- |_________________|_____________________|_________________________________|
- |DEF_NEWALIAS_PATH|newaliases_path |/usr/bin/newaliases |
- |_________________|_____________________|_________________________________|
- |DEF_QUEUE_DIR |queue_directory |/var/spool/postfix |
- |_________________|_____________________|_________________________________|
- |DEF_README_DIR |readme_directory |no |
- |_________________|_____________________|_________________________________|
- |DEF_SENDMAIL_PATH|sendmail_path |/usr/sbin/sendmail |
- |_________________|_____________________|_________________________________|
+ ____________________________________________________________
+ |Macro name |default value for |typical default |
+ |_________________|_____________________|____________________|
+ |DEF_COMMAND_DIR |command_directory |/usr/sbin |
+ |_________________|_____________________|____________________|
+ |DEF_CONFIG_DIR |config_directory |/etc/postfix |
+ |_________________|_____________________|____________________|
+ |DEF_DB_TYPE |default_database_type|lmdb or hash |
+ |_________________|_____________________|____________________|
+ |DEF_CACHE_DB_TYPE|default_cache_db_type|lmdb or btree |
+ |_________________|_____________________|____________________|
+ |DEF_DAEMON_DIR |daemon_directory |/usr/libexec/postfix|
+ |_________________|_____________________|____________________|
+ |DEF_DATA_DIR |data_directory |/var/lib/postfix |
+ |_________________|_____________________|____________________|
+ |DEF_MAILQ_PATH |mailq_path |/usr/bin/mailq |
+ |_________________|_____________________|____________________|
+ |DEF_HTML_DIR |html_directory |no |
+ |_________________|_____________________|____________________|
+ |DEF_MANPAGE_DIR |manpage_directory |/usr/local/man |
+ |_________________|_____________________|____________________|
+ |DEF_NEWALIAS_PATH|newaliases_path |/usr/bin/newaliases |
+ |_________________|_____________________|____________________|
+ |DEF_QUEUE_DIR |queue_directory |/var/spool/postfix |
+ |_________________|_____________________|____________________|
+ |DEF_README_DIR |readme_directory |no |
+ |_________________|_____________________|____________________|
+ |DEF_SENDMAIL_PATH|sendmail_path |/usr/sbin/sendmail |
+ |_________________|_____________________|____________________|
Note: the data_directory parameter (for caches and pseudo-random numbers) was
introduced with Postfix version 2.5.
diff --git a/postfix/README_FILES/INSTALL b/postfix/README_FILES/INSTALL
index 8a91750f7..cd175c735 100644
--- a/postfix/README_FILES/INSTALL
+++ b/postfix/README_FILES/INSTALL
@@ -67,18 +67,18 @@ path.
$ export MANPATH; MANPATH="`pwd`/man:$MANPATH"
$ setenv MANPATH "`pwd`/man:$MANPATH"
-Of particular interest is the postconf(5) manual page that lists all the 500+
-configuration parameters. The HTML version of this text makes it easy to
-navigate around.
+Of particular interest is the postconf(5) manual page that lists all the 900+
+configuration parameters. The hyperlinks in the HTML version (html/
+postconf.5.html) make the text easy to navigate.
All Postfix source files have their own built-in manual page. Tools to extract
those embedded manual pages are available in the mantools directory.
44 -- BBuuiillddiinngg oonn aa ssuuppppoorrtteedd ssyysstteemm
-Postfix development happens on FreeBSD and MacOS X, with regular tests on Linux
-(Fedora, Ubuntu) and Solaris. Support for other systems relies on feedback from
-their users, and may not always be up-to-date.
+Postfix development happens on FreeBSD and Linux, with occasional tests on
+Solaris. Support for other systems relies on feedback from their users, and may
+not always be up-to-date.
OpenBSD is partially supported. The libc resolver does not implement the
documented "internal resolver options which are [...] set by changing fields in
@@ -425,44 +425,43 @@ Parameters whose defaults can be specified in this way are listed below. See
the postconf(5) manpage for a description (command: "nroff -man man/man5/
postconf.5 | less").
- _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
- |ppaarraammeetteerr nnaammee |ttyyppiiccaall ddeeffaauulltt |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |command_directory |/usr/sbin |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |config_directory |/etc/postfix |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |default_database_type|hash |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |default_cache_db_type|(lmdb if default_database_type is lmdb, otherwise|
- | |btree) |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |daemon_directory |/usr/libexec/postfix |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |data_directory |/var/lib/postfix |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |html_directory |no |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |mail_spool_directory |/var/mail |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |mailq_path |/usr/bin/mailq |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |manpage_directory |/usr/local/man |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |meta_directory |/etc/postfix |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |newaliases_path |/usr/bin/newaliases |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |openssl_path |openssl |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |queue_directory |/var/spool/postfix |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |readme_directory |no |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |sendmail_path |/usr/sbin/sendmail |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |shlib_directory |/usr/lib/postfix |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
+ |ppaarraammeetteerr nnaammee |ttyyppiiccaall ddeeffaauulltt |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |command_directory |/usr/sbin |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |config_directory |/etc/postfix |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |default_database_type|lmdb or hash |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |default_cache_db_type|lmdb or btree |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |daemon_directory |/usr/libexec/postfix|
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |data_directory |/var/lib/postfix |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |html_directory |no |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |mail_spool_directory |/var/mail |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |mailq_path |/usr/bin/mailq |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |manpage_directory |/usr/local/man |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |meta_directory |/etc/postfix |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |newaliases_path |/usr/bin/newaliases |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |openssl_path |openssl |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |queue_directory |/var/spool/postfix |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |readme_directory |no |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |sendmail_path |/usr/sbin/sendmail |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |shlib_directory |/usr/lib/postfix |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
44..66..22 -- AAllll PPoossttffiixx vveerrssiioonnss
@@ -480,35 +479,35 @@ Parameters whose defaults can be specified in this way are listed below. See
the postconf(5) manpage for a description (command: "nroff -man man/man5/
postconf.5 | less").
- _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
- |MMaaccrroo nnaammee |ddeeffaauulltt vvaalluuee ffoorr |ttyyppiiccaall ddeeffaauulltt |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |DEF_COMMAND_DIR |command_directory |/usr/sbin |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |DEF_CONFIG_DIR |config_directory |/etc/postfix |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |DEF_DB_TYPE |default_database_type|hash |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |DEF_CACHE_DB_TYPE|default_cache_db_type|hash or lmdb, depends on platform|
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |DEF_DAEMON_DIR |daemon_directory |/usr/libexec/postfix |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |DEF_DATA_DIR |data_directory |/var/lib/postfix |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |DEF_MAILQ_PATH |mailq_path |/usr/bin/mailq |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |DEF_HTML_DIR |html_directory |no |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |DEF_MANPAGE_DIR |manpage_directory |/usr/local/man |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |DEF_NEWALIAS_PATH|newaliases_path |/usr/bin/newaliases |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |DEF_QUEUE_DIR |queue_directory |/var/spool/postfix |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |DEF_README_DIR |readme_directory |no |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
- |DEF_SENDMAIL_PATH|sendmail_path |/usr/sbin/sendmail |
- |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
+ |MMaaccrroo nnaammee |ddeeffaauulltt vvaalluuee ffoorr |ttyyppiiccaall ddeeffaauulltt |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |DEF_COMMAND_DIR |command_directory |/usr/sbin |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |DEF_CONFIG_DIR |config_directory |/etc/postfix |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |DEF_DB_TYPE |default_database_type|lmdb or hash |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |DEF_CACHE_DB_TYPE|default_cache_db_type|lmdb or btree |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |DEF_DAEMON_DIR |daemon_directory |/usr/libexec/postfix|
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |DEF_DATA_DIR |data_directory |/var/lib/postfix |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |DEF_MAILQ_PATH |mailq_path |/usr/bin/mailq |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |DEF_HTML_DIR |html_directory |no |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |DEF_MANPAGE_DIR |manpage_directory |/usr/local/man |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |DEF_NEWALIAS_PATH|newaliases_path |/usr/bin/newaliases |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |DEF_QUEUE_DIR |queue_directory |/var/spool/postfix |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |DEF_README_DIR |readme_directory |no |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
+ |DEF_SENDMAIL_PATH|sendmail_path |/usr/sbin/sendmail |
+ |_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _|_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ |
Note: the data_directory parameter (for caches and pseudo-random numbers) was
introduced with Postfix version 2.5.
diff --git a/postfix/RELEASE_NOTES b/postfix/RELEASE_NOTES
index 852fef1e9..4bbf74e93 100644
--- a/postfix/RELEASE_NOTES
+++ b/postfix/RELEASE_NOTES
@@ -44,34 +44,33 @@ following commands in their build process:
1 - Make lmdb the default for both default_database_type
and default_cache_db_type.
- make makefiles CCARGS="-NO_DB ..." default_database_type=lmdb
+ make makefiles CCARGS="-DNO_DB ..." default_database_type=lmdb \
+ default_cache_db_type=lmdb
2 - Make cdb the default for default_database_type, and make
lmdb the default for default_cache_db_type.
- make makefiles CCARGS="-NO_DB ..." default_database_type=cdb \
+ make makefiles CCARGS="-DNO_DB ..." default_database_type=cdb \
default_cache_db_type=lmdb
-Postfix hash and btree files can easily be migrated when the
-source file is available. Just run
+Postfix hash and btree files can easily be migrated when the source
+file (without the '.db name suffix) is available. Just run
postmap lmdb:/path/to/file
-That does not work for address_verify_map and postscreen_cache_map
-because there is no source file. In that case, to migrate a btree
-file to lmdb, execute as root:
+That does not work for address_verify_map, postscreen_cache_map,
+and the optional smtp_sasl_auth_cache_name. These have no source
+file because they are managed by Postfix daemon processes.
+
+You can either ignore these files (they will be populated again
+over time), or you can copy the existing entries from the existing
+'.db' file to a new '.lmdb' . file. But that is possible only if
+Berkeley DB support is still available. Execute as root:
rm -f /path/to/file.lmdb
postmap -s btree:/path/to/file | postmap -i lmdb:/path/to/file
chown postfix /path/to/file.lmdb
-This should happen for every btree datbase with long-lived data that
-has no data source file: address_verify_map, postscreen_cache_map,
-and the optional smtp_sasl_auth_cache_name.
-
-Limitation: the above database migration commands work only if
-Berkeley DB btree support is still available :-(
-
[Feature 20250321] Safety: the SQLite client now logs a warning
when a query uses double quotes instead of the Postfix-recommended
single quotes. Only the recommended form is protected against SQL
diff --git a/postfix/html/INSTALL.html b/postfix/html/INSTALL.html
index 5bca3382e..7446b7877 100644
--- a/postfix/html/INSTALL.html
+++ b/postfix/html/INSTALL.html
@@ -126,9 +126,9 @@ $ setenv MANPATH "`pwd`/man:$MANPATH"
- Of particular interest is the postconf(5) manual page that
-lists all the 500+ configuration parameters. The HTML version of
-this text makes it easy to navigate around.
+ Of particular interest is the postconf(5) manual page that lists
+all the 900+ configuration parameters. The hyperlinks in the HTML
+version (html/postconf.5.html) make the text easy to navigate.
All Postfix source files have their own built-in manual page.
Tools to extract those embedded manual pages are available in the
@@ -136,10 +136,9 @@ mantools directory.
- Postfix development happens on FreeBSD and MacOS X, with regular
-tests on Linux (Fedora, Ubuntu) and Solaris. Support for other
-systems relies on feedback from their users, and may not always be
-up-to-date.
+ Postfix development happens on FreeBSD and Linux, with occasional
+tests on Solaris. Support for other systems relies on feedback from
+their users, and may not always be up-to-date.
OpenBSD is partially supported. The libc resolver does not
implement the documented "internal resolver options which are [...]
@@ -672,9 +671,9 @@ listed below. See the postconf(5) manpage for a de
| config_directory | /etc/postfix |
- | default_database_type | hash |
+ | default_database_type | lmdb or hash |
- | default_cache_db_type | (lmdb if default_database_type is lmdb, otherwise btree) |
+ | default_cache_db_type | lmdb or btree |
| daemon_directory | /usr/libexec/postfix |
@@ -742,10 +741,10 @@ default
/etc/postfix |
| DEF_DB_TYPE | default_database_type |
-hash |
+lmdb or hash |
| DEF_CACHE_DB_TYPE | default_cache_db_type |
-hash or lmdb, depends on platform |
+lmdb or btree |
| DEF_DAEMON_DIR | daemon_directory |
/usr/libexec/postfix |
diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html
index b82a70a03..6bcbf5f9b 100644
--- a/postfix/html/postconf.5.html
+++ b/postfix/html/postconf.5.html
@@ -225,7 +225,7 @@ This feature is available in Postfix 2.1 and later.
address_verify_map
-(default: Postfix ≥ 3.11: $default_cache_db_type:$data_directory/address_verify_map; Postfix < 3,11: btree:$data_directory/address_verify_map)
+(default: Postfix ≥ 3.11: $default_cache_db_type:$data_directory/verify_cache; Postfix < 3.11: btree:$data_directory/verify_cache)
Lookup table for persistent address verification status
@@ -258,8 +258,9 @@ Examples:
-address_verify_map = hash:/var/lib/postfix/verify
-address_verify_map = btree:/var/lib/postfix/verify
+address_verify_map = $default_cache_db_type:$data_directory/verify_cache
+address_verify_map = hash:/var/lib/postfix/verify_cache
+address_verify_map = btree:/var/lib/postfix/verify_cache
@@ -2021,7 +2022,7 @@ Example:
default_cache_db_type
-(default: lmdb if default_database_type is lmdb, otherwise btree)
+(default: see 'postconf -d default_cache_db_type' output)
The default database type for address_verify_map and
postscreen_cache_map. Before Postfix 3.11 those caches used btree
@@ -8727,7 +8728,7 @@ The default time unit is h (hours).
postscreen_cache_map
-(default: Postfix ≥ 3.11: $default_cache_db_type:$data_directory/postscreen_cache_map; Postfix < 3.11: btree:$data_directory/postscreen_cache_map)
+(default: Postfix ≥ 3.11: $default_cache_db_type:$data_directory/postscreen_cache; Postfix < 3.11: btree:$data_directory/postscreen_cache)
Persistent storage for the postscreen(8) server decisions.
diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5
index e27010702..fe249afcd 100644
--- a/postfix/man/man5/postconf.5
+++ b/postfix/man/man5/postconf.5
@@ -134,7 +134,7 @@ Overrides the local_transport parameter setting for address
verification probes.
.PP
This feature is available in Postfix 2.1 and later.
-.SH address_verify_map (default: Postfix >= 3.11: $default_cache_db_type:$data_directory/address_verify_map; Postfix < 3,11: btree:$data_directory/address_verify_map)
+.SH address_verify_map (default: Postfix >= 3.11: $default_cache_db_type:$data_directory/verify_cache; Postfix < 3.11: btree:$data_directory/verify_cache)
Lookup table for persistent address verification status
storage. The table is maintained by the \fBverify\fR(8) service, and
is opened before the process releases privileges.
@@ -159,8 +159,9 @@ Examples:
.PP
.nf
.na
-address_verify_map = hash:/var/lib/postfix/verify
-address_verify_map = btree:/var/lib/postfix/verify
+address_verify_map = $default_cache_db_type:$data_directory/verify_cache
+address_verify_map = hash:/var/lib/postfix/verify_cache
+address_verify_map = btree:/var/lib/postfix/verify_cache
.fi
.ad
.PP
@@ -1226,7 +1227,7 @@ debugger_command =
ddd $daemon_directory/$process_name $process_id & sleep 5
.fi
.ad
-.SH default_cache_db_type (default: lmdb if default_database_type is lmdb, otherwise btree)
+.SH default_cache_db_type (default: see 'postconf \-d default_cache_db_type' output)
The default database type for address_verify_map and
postscreen_cache_map. Before Postfix 3.11 those caches used btree
by default.
@@ -5427,7 +5428,7 @@ one\-letter suffix that specifies the time unit). Time units: s
The default time unit is h (hours).
.PP
This feature is available in Postfix 2.8.
-.SH postscreen_cache_map (default: Postfix >= 3.11: $default_cache_db_type:$data_directory/postscreen_cache_map; Postfix < 3.11: btree:$data_directory/postscreen_cache_map)
+.SH postscreen_cache_map (default: Postfix >= 3.11: $default_cache_db_type:$data_directory/postscreen_cache; Postfix < 3.11: btree:$data_directory/postscreen_cache)
Persistent storage for the \fBpostscreen\fR(8) server decisions.
.PP
To share a \fBpostscreen\fR(8) cache between multiple \fBpostscreen\fR(8)
diff --git a/postfix/proto/INSTALL.html b/postfix/proto/INSTALL.html
index 0b92e3a06..3bc012c8c 100644
--- a/postfix/proto/INSTALL.html
+++ b/postfix/proto/INSTALL.html
@@ -126,9 +126,9 @@ $ setenv MANPATH "`pwd`/man:$MANPATH"
- Of particular interest is the postconf(5) manual page that
-lists all the 500+ configuration parameters. The HTML version of
-this text makes it easy to navigate around.
+ Of particular interest is the postconf(5) manual page that lists
+all the 900+ configuration parameters. The hyperlinks in the HTML
+version (html/postconf.5.html) make the text easy to navigate.
All Postfix source files have their own built-in manual page.
Tools to extract those embedded manual pages are available in the
@@ -136,10 +136,9 @@ mantools directory.
- Postfix development happens on FreeBSD and MacOS X, with regular
-tests on Linux (Fedora, Ubuntu) and Solaris. Support for other
-systems relies on feedback from their users, and may not always be
-up-to-date.
+ Postfix development happens on FreeBSD and Linux, with occasional
+tests on Solaris. Support for other systems relies on feedback from
+their users, and may not always be up-to-date.
OpenBSD is partially supported. The libc resolver does not
implement the documented "internal resolver options which are [...]
@@ -672,9 +671,9 @@ listed below. See the postconf(5) manpage for a description
| config_directory | /etc/postfix |
- | default_database_type | hash |
+ | default_database_type | lmdb or hash |
- | default_cache_db_type | (lmdb if default_database_type is lmdb, otherwise btree) |
+ | default_cache_db_type | lmdb or btree |
| daemon_directory | /usr/libexec/postfix |
@@ -742,10 +741,10 @@ default
/etc/postfix |
| DEF_DB_TYPE | default_database_type |
-hash |
+lmdb or hash |
| DEF_CACHE_DB_TYPE | default_cache_db_type |
-hash or lmdb, depends on platform |
+lmdb or btree |
| DEF_DAEMON_DIR | daemon_directory |
/usr/libexec/postfix |
diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto
index 0a3e84224..4c48d3e67 100644
--- a/postfix/proto/postconf.proto
+++ b/postfix/proto/postconf.proto
@@ -202,7 +202,7 @@ verification probes.
This feature is available in Postfix 2.1 and later.
-%PARAM address_verify_map Postfix ≥ 3.11: $default_cache_db_type:$data_directory/address_verify_map; Postfix < 3,11: btree:$data_directory/address_verify_map
+%PARAM address_verify_map Postfix ≥ 3.11: $default_cache_db_type:$data_directory/verify_cache; Postfix < 3.11: btree:$data_directory/verify_cache
Lookup table for persistent address verification status
@@ -235,8 +235,9 @@ Examples:
-address_verify_map = hash:/var/lib/postfix/verify
-address_verify_map = btree:/var/lib/postfix/verify
+address_verify_map = $default_cache_db_type:$data_directory/verify_cache
+address_verify_map = hash:/var/lib/postfix/verify_cache
+address_verify_map = btree:/var/lib/postfix/verify_cache
@@ -14670,7 +14671,7 @@ inspection for DKIM-signed mail from known friendly domains.
This feature is available in Postfix 2.7, and as an optional
patch for Postfix 2.6.
-%PARAM postscreen_cache_map Postfix ≥ 3.11: $default_cache_db_type:$data_directory/postscreen_cache_map; Postfix < 3.11: btree:$data_directory/postscreen_cache_map
+%PARAM postscreen_cache_map Postfix ≥ 3.11: $default_cache_db_type:$data_directory/postscreen_cache; Postfix < 3.11: btree:$data_directory/postscreen_cache
Persistent storage for the postscreen(8) server decisions.
@@ -20293,7 +20294,7 @@ to=<recipient>
This feature is available in Postfix ≥ 3.11.
-%PARAM default_cache_db_type lmdb if default_database_type is lmdb, otherwise btree
+%PARAM default_cache_db_type see 'postconf -d default_cache_db_type' output
The default database type for address_verify_map and
postscreen_cache_map. Before Postfix 3.11 those caches used btree
diff --git a/postfix/src/global/mail_params.h b/postfix/src/global/mail_params.h
index 4436fcdd8..3a656f828 100644
--- a/postfix/src/global/mail_params.h
+++ b/postfix/src/global/mail_params.h
@@ -382,9 +382,6 @@ extern char *var_db_type;
* is system dependent. It is defined in .
*/
#define VAR_CACHE_DB_TYPE "default_cache_db_type"
-#ifndef DEF_CACHE_DB_TYPE
-#define DEF_CACHE_DB_TYPE "${{$default_database_type}=={lmdb}?{lmdb}:{btree}}"
-#endif
extern char *var_cache_db_type;
/*
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 52ad87eed..c38d2c22b 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 "20251226"
-#define MAIL_VERSION_NUMBER "3.11.0-RC2"
+#define MAIL_RELEASE_DATE "20251231"
+#define MAIL_VERSION_NUMBER "3.11.0-RC3"
#ifdef SNAPSHOT
#define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE
diff --git a/postfix/src/util/sys_defs.h b/postfix/src/util/sys_defs.h
index 4d27ea7c3..76c495ce9 100644
--- a/postfix/src/util/sys_defs.h
+++ b/postfix/src/util/sys_defs.h
@@ -1306,6 +1306,14 @@ extern int h_errno;
#define DEF_DB_TYPE NATIVE_DB_TYPE
#endif
+#ifndef NATIVE_CACHE_DB_TYPE
+#define NATIVE_CACHE_DB_TYPE "btree" /* Postfix < 3.11 default */
+#endif
+
+#ifndef DEF_CACHE_DB_TYPE
+#define DEF_CACHE_DB_TYPE NATIVE_CACHE_DB_TYPE
+#endif
+
#define CAST_ANY_PTR_TO_INT(cptr) ((int) (long) (cptr))
#define CAST_INT_TO_VOID_PTR(ival) ((void *) (long) (ival))
--
2.47.3