snapshot-20001211

diff --git a/postfix/HISTORY b/postfix/HISTORY
index bdfbb6022b6dc2fc7c9176696f6349659d897bfe..367e86c242300ceba382bc0b7ed1f9064a1e020c 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -4608,3 +4608,9 @@ Apologies for any names omitted.
        Feature: support for MYSQL connections over UNIX-domain
        sockets by Piotr Klaban.  Files: util/dict_mysql.c,
        MYSQL_README.
+
+20001211
+
+       Small dirt: postconf -m produced too much output due to a
+       missing "else", and the optional SASL code needed a fix
+       for the changed name_mask API.

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 6600e0d3b156ad0034def43872a65df16236891e..de06b8f6cd6a28157e1b61079f6c10fc0b02b217 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -15,7 +15,7 @@
   * Version of this program.
   */
 #define VAR_MAIL_VERSION       "mail_version"
-#define DEF_MAIL_VERSION       "Snapshot-20001210"
+#define DEF_MAIL_VERSION       "Snapshot-20001211"
 extern char *var_mail_version;
 
 /* LICENSE

diff --git a/postfix/src/postconf/postconf.c b/postfix/src/postconf/postconf.c
index 8a5409bbbbefff0843f61f8caa6a7b5f16ccf8e8..10bb928d9064a36dcac9c2089e844a40084a07a7 100644 (file)
--- a/postfix/src/postconf/postconf.c
+++ b/postfix/src/postconf/postconf.c
@@ -741,7 +741,7 @@ int     main(int argc, char **argv)
            msg_verbose++;
            break;
        default:
-           msg_fatal("usage: %s [-c config_dir] [-d (defaults)] [-e (edit)] [-h (no names)] [-l (lock types)] [-m (map types) [-n (non-defaults)] [-v] [name...]", argv[0]);
+           msg_fatal("usage: %s [-c config_dir] [-d (defaults)] [-e (edit)] [-h (no names)] [-l (lock types)] [-m (map types)] [-n (non-defaults)] [-v] [name...]", argv[0]);
        }
     }
 
@@ -763,7 +763,7 @@ int     main(int argc, char **argv)
     /*
      * If showing locking methods, show them and exit
      */
-    if (mode & SHOW_LOCKS) {
+    else if (mode & SHOW_LOCKS) {
        show_locks();
     }
 

diff --git a/postfix/src/smtpd/smtpd_sasl_glue.c b/postfix/src/smtpd/smtpd_sasl_glue.c
index fe4232cc6e2fbd2745e7dfb4b352e694843b5e29..caa3ec04fb1305bed15715855a0f0dcfd50750ba 100644 (file)
--- a/postfix/src/smtpd/smtpd_sasl_glue.c
+++ b/postfix/src/smtpd/smtpd_sasl_glue.c
@@ -164,7 +164,8 @@ void    smtpd_sasl_initialize(void)
     /*
      * Configuration parameters.
      */
-    smtpd_sasl_opts = name_mask(smtpd_sasl_mask, var_smtpd_sasl_opts);
+    smtpd_sasl_opts = name_mask(VAR_SMTPD_SASL_OPTS, smtpd_sasl_mask,
+                               var_smtpd_sasl_opts);
 }
 
 /* smtpd_sasl_connect - per-connection initialization */