postfix-3.2.16

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 48d4ff47b500f18dd1a1ca322188aaed5b3cd794..707bad4b7c5b73d23bffab763547f6e119b83c6f 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -23320,3 +23320,9 @@ Apologies for any names omitted.
        session may cause a false 'lost connection' error for a
        concurrent TLS session in the same tlsproxy process. File:
        tlsproxy/tlsproxy.c.
+
+20200530
+
+       Bugfix (introduced: Postfix 3.1): "postfix tls deploy-server-cert"
+       did not handle a missing optional argument. File:
+       conf/postfix-tls-script.

diff --git a/postfix/conf/postfix-tls-script b/postfix/conf/postfix-tls-script
index 2c3430a1ade647d9a0151a46f9ccb794108ae301..1a364b7fc306df0e1911b927728721ed9b868023 100644 (file)
--- a/postfix/conf/postfix-tls-script
+++ b/postfix/conf/postfix-tls-script
@@ -777,7 +777,7 @@ get_cache_db_type() {
 deploy_server_cert() {
     certfile=$1; shift
     keyfile=$1; shift
-    deploy=$1; shift
+    case $# in 0) deploy=;; *) deploy=$1; shift;; esac
 
     # Sets key_algo, key_param and cert_param
     check_key "$keyfile" || return 1

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 6f5acc4ae583a7169c54d58a886632abfb2573c0..ca30ebb27220868fab21e7bed6b479966b58ed3f 100644 (file)
--- 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      "20200516"
-#define MAIL_VERSION_NUMBER    "3.2.15"
+#define MAIL_RELEASE_DATE      "20200614"
+#define MAIL_VERSION_NUMBER    "3.2.16"
 
 #ifdef SNAPSHOT
 #define MAIL_VERSION_DATE      "-" MAIL_RELEASE_DATE