diff --git a/postfix/HISTORY b/postfix/HISTORY
index bdfbb6022..367e86c24 100644
--- 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 6600e0d3b..de06b8f6c 100644
--- 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 8a5409bbb..10bb928d9 100644
--- 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 fe4232cc6..caa3ec04f 100644
--- 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 */