diff --git a/postfix/HISTORY b/postfix/HISTORY
index e94273612..dbcab057f 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -21443,3 +21443,12 @@ Apologies for any names omitted.
error handling with longjmp() calls. This could introduce
memory leaks in check_mumble_access() callers. Files:
smtpd/smtpd_check.c, smtpd/smtpd_error.ref.
+
+20140122
+
+ Cleanup: miscellaneous cruft, typos, comments, error messages.
+ proto/COMPATIBILITY_README.html, global/addr_match_list.c,
+ global/domain_list.c, global/namadr_list.c, global/string_list.c,
+ global/user_acl.c, postalias/postalias.c, postmap/postmap.c,
+ tls/tls_client.c, util/dict_alloc.c, util/dict_open.c,
+ util/match_list.c.
diff --git a/postfix/README_FILES/COMPATIBILITY_README b/postfix/README_FILES/COMPATIBILITY_README
index 223597d86..fd76e916d 100644
--- a/postfix/README_FILES/COMPATIBILITY_README
+++ b/postfix/README_FILES/COMPATIBILITY_README
@@ -1,4 +1,4 @@
-PPoossttffiixx BBaacckkwwaarrddss--CCoommppaattiibbiilliittyy SSaaffttyy NNeett
+PPoossttffiixx BBaacckkwwaarrddss--CCoommppaattiibbiilliittyy SSaaffeettyy NNeett
-------------------------------------------------------------------------------
diff --git a/postfix/WISHLIST b/postfix/WISHLIST
index 2c40daa3e..222532303 100644
--- a/postfix/WISHLIST
+++ b/postfix/WISHLIST
@@ -8,8 +8,8 @@ Wish list:
Things to do after the stable release:
- Back out check_dict_get() because the longjmp() calls
- introduce memory leaks upstream.
+ Update smtpd command count when rejecting input before
+ command-table lookup.
postconf -P: emit '{ name = value }' when editing/adding a
parameter whose new value contains whitespace.
diff --git a/postfix/html/COMPATIBILITY_README.html b/postfix/html/COMPATIBILITY_README.html
index 87519dd5a..88c26be23 100644
--- a/postfix/html/COMPATIBILITY_README.html
+++ b/postfix/html/COMPATIBILITY_README.html
@@ -5,7 +5,7 @@
-Postfix Backwards-Compatibility Safty Net
+Postfix Backwards-Compatibility Safety Net
@@ -14,7 +14,7 @@
Postfix
-Backwards-Compatibility Safty Net
+Backwards-Compatibility Safety Net
diff --git a/postfix/proto/COMPATIBILITY_README.html b/postfix/proto/COMPATIBILITY_README.html
index 6b4b9b57b..530a269b1 100644
--- a/postfix/proto/COMPATIBILITY_README.html
+++ b/postfix/proto/COMPATIBILITY_README.html
@@ -5,7 +5,7 @@
-Postfix Backwards-Compatibility Safty Net
+Postfix Backwards-Compatibility Safety Net
@@ -14,7 +14,7 @@
Postfix
-Backwards-Compatibility Safty Net
+Backwards-Compatibility Safety Net
diff --git a/postfix/src/global/addr_match_list.c b/postfix/src/global/addr_match_list.c
index de3d3f967..8008df203 100644
--- a/postfix/src/global/addr_match_list.c
+++ b/postfix/src/global/addr_match_list.c
@@ -6,7 +6,8 @@
/* SYNOPSIS
/* #include
/*
-/* ADDR_MATCH_LIST *addr_match_list_init(flags, pattern_list)
+/* ADDR_MATCH_LIST *addr_match_list_init(pname, flags, pattern_list)
+/* const char *pname;
/* int flags;
/* const char *pattern_list;
/*
@@ -34,7 +35,8 @@
/* A host matches a list when its address matches a pattern.
/* The matching process is case insensitive.
/*
-/* addr_match_list_init() performs initializations. The first
+/* addr_match_list_init() performs initializations. The pname
+/* argument specifies error reporting context. The flags
/* argument is the bit-wise OR of zero or more of the following:
/* .IP MATCH_FLAG_RETURN
/* Request that addr_match_list_match() logs a warning and
@@ -42,7 +44,7 @@
/* error code, instead of raising a fatal error.
/* .PP
/* Specify MATCH_FLAG_NONE to request none of the above.
-/* The second argument is a list of patterns, or the absolute
+/* The last argument is a list of patterns, or the absolute
/* pathname of a file with patterns.
/*
/* addr_match_list_match() matches the specified host address
diff --git a/postfix/src/global/domain_list.c b/postfix/src/global/domain_list.c
index 2bcd38d2d..d79beafd3 100644
--- a/postfix/src/global/domain_list.c
+++ b/postfix/src/global/domain_list.c
@@ -6,7 +6,8 @@
/* SYNOPSIS
/* #include
/*
-/* DOMAIN_LIST *domain_list_init(flags, pattern_list)
+/* DOMAIN_LIST *domain_list_init(pname, flags, pattern_list)
+/* const char *pname;
/* int flags;
/* const char *pattern_list;
/*
@@ -33,7 +34,8 @@
/* insensitive. In order to reverse the result, precede a
/* pattern with an exclamation point (!).
/*
-/* domain_list_init() performs initializations. The first argument
+/* domain_list_init() performs initializations. The pname
+/* argument specifies error reporting context. The flags argument
/* is the bit-wise OR of zero or more of the following:
/* .IP MATCH_FLAG_PARENT
/* The hostname pattern foo.com matches itself and any name below
@@ -45,7 +47,7 @@
/* code, instead of raising a fatal error.
/* .PP
/* Specify MATCH_FLAG_NONE to request none of the above.
-/* The second argument is a list of domain patterns, or the name of
+/* The last argument is a list of domain patterns, or the name of
/* a file containing domain patterns.
/*
/* domain_list_match() matches the specified host or domain name
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index fa178f00a..c6d5867e4 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
* Patches change both the patchlevel and the release date. Snapshots have no
* patchlevel; they change the release date only.
*/
-#define MAIL_RELEASE_DATE "20150121"
+#define MAIL_RELEASE_DATE "20150122"
#define MAIL_VERSION_NUMBER "2.12"
#ifdef SNAPSHOT
diff --git a/postfix/src/global/namadr_list.c b/postfix/src/global/namadr_list.c
index 1be7d54c9..071a73341 100644
--- a/postfix/src/global/namadr_list.c
+++ b/postfix/src/global/namadr_list.c
@@ -6,7 +6,8 @@
/* SYNOPSIS
/* #include
/*
-/* NAMADR_LIST *namadr_list_init(flags, pattern_list)
+/* NAMADR_LIST *namadr_list_init(pname, flags, pattern_list)
+/* const char *pname;
/* int flags;
/* const char *pattern_list;
/*
@@ -38,7 +39,8 @@
/* a pattern, or when any of its parent domains matches a
/* pattern. The matching process is case insensitive.
/*
-/* namadr_list_init() performs initializations. The first
+/* namadr_list_init() performs initializations. The pname
+/* argument specifies error reporting context. The flags
/* argument is the bit-wise OR of zero or more of the
/* following:
/* .IP MATCH_FLAG_PARENT
@@ -51,7 +53,7 @@
/* code, instead of raising a fatal error.
/* .PP
/* Specify MATCH_FLAG_NONE to request none of the above.
-/* The second argument is a list of patterns, or the absolute
+/* The last argument is a list of patterns, or the absolute
/* pathname of a file with patterns.
/*
/* namadr_list_match() matches the specified host name and
diff --git a/postfix/src/global/string_list.c b/postfix/src/global/string_list.c
index 076556783..ddd950a00 100644
--- a/postfix/src/global/string_list.c
+++ b/postfix/src/global/string_list.c
@@ -6,7 +6,8 @@
/* SYNOPSIS
/* #include
/*
-/* STRING_LIST *string_list_init(flags, pattern_list)
+/* STRING_LIST *string_list_init(pname, flags, pattern_list)
+/* const char *pname;
/* int flags;
/* const char *pattern_list;
/*
@@ -31,7 +32,8 @@
/* In order to reverse the result, precede a pattern with an
/* exclamation point (!).
/*
-/* string_list_init() performs initializations. The first argument
+/* string_list_init() performs initializations. The pname
+/* argument specifies error reporting context. The flags argument
/* is a bit-wise OR of zero or more of following:
/* .IP MATCH_FLAG_RETURN
/* Request that string_list_match() logs a warning and returns
@@ -39,7 +41,7 @@
/* code, instead of raising a fatal error.
/* .PP
/* Specify MATCH_FLAG_NONE to request none of the above.
-/* The second argument specifies a list of string patterns.
+/* The last argument specifies a list of string patterns.
/*
/* string_list_match() matches the specified string against the
/* compiled pattern list.
diff --git a/postfix/src/global/user_acl.c b/postfix/src/global/user_acl.c
index ecdde9f15..a79b7d512 100644
--- a/postfix/src/global/user_acl.c
+++ b/postfix/src/global/user_acl.c
@@ -7,7 +7,7 @@
/* #include
/*
/* const char *check_user_acl_byuid(pname, acl, uid)
-/* cobnst char *pname;
+/* const char *pname;
/* const char *acl;
/* uid_t uid;
/* DESCRIPTION
diff --git a/postfix/src/postalias/postalias.c b/postfix/src/postalias/postalias.c
index 7826725c6..c818d8ce2 100644
--- a/postfix/src/postalias/postalias.c
+++ b/postfix/src/postalias/postalias.c
@@ -351,7 +351,8 @@ static void postalias(char *map_type, char *path_name, int postalias_flags,
if ((mkmap->dict->flags & DICT_FLAG_UTF8_ACTIVE)
&& !allascii(STR(line_buffer))
&& !valid_utf8_string(STR(line_buffer), LEN(line_buffer))) {
- msg_warn("%s, line %d: non-UTF-8 input \"%s\"",
+ msg_warn("%s, line %d: non-UTF-8 input \"%s\""
+ " -- ignoring this line",
VSTREAM_PATH(source_fp), lineno, STR(line_buffer));
continue;
}
diff --git a/postfix/src/postconf/test46.ref b/postfix/src/postconf/test46.ref
index 7939f93c6..aac7c1f4e 100644
--- a/postfix/src/postconf/test46.ref
+++ b/postfix/src/postconf/test46.ref
@@ -1 +1 @@
-./postconf: fatal: invalid private field X" in "bar inet X n n - 0 other"
+./postconf: fatal: invalid private field "X" in "bar inet X n n - 0 other"
diff --git a/postfix/src/postconf/test47.ref b/postfix/src/postconf/test47.ref
index a44606809..e8d46ed36 100644
--- a/postfix/src/postconf/test47.ref
+++ b/postfix/src/postconf/test47.ref
@@ -1 +1 @@
-./postconf: fatal: invalid unprivileged field X" in "bar inet - X n - 0 other"
+./postconf: fatal: invalid unprivileged field "X" in "bar inet - X n - 0 other"
diff --git a/postfix/src/postconf/test48.ref b/postfix/src/postconf/test48.ref
index ae76ff575..9403117fd 100644
--- a/postfix/src/postconf/test48.ref
+++ b/postfix/src/postconf/test48.ref
@@ -1 +1 @@
-./postconf: fatal: invalid chroot field X" in "bar inet - n X - 0 other"
+./postconf: fatal: invalid chroot field "X" in "bar inet - n X - 0 other"
diff --git a/postfix/src/postconf/test49.ref b/postfix/src/postconf/test49.ref
index 492215569..f52b171e1 100644
--- a/postfix/src/postconf/test49.ref
+++ b/postfix/src/postconf/test49.ref
@@ -1 +1 @@
-./postconf: fatal: invalid wakeup field X" in "bar inet - n n X 0 other"
+./postconf: fatal: invalid wakeup field "X" in "bar inet - n n X 0 other"
diff --git a/postfix/src/postconf/test50.ref b/postfix/src/postconf/test50.ref
index 8b5af2c50..41cdc444a 100644
--- a/postfix/src/postconf/test50.ref
+++ b/postfix/src/postconf/test50.ref
@@ -1 +1 @@
-./postconf: fatal: invalid process_limit field X" in "bar inet - n n - X other"
+./postconf: fatal: invalid process_limit field "X" in "bar inet - n n - X other"
diff --git a/postfix/src/postconf/test51.ref b/postfix/src/postconf/test51.ref
index d5ff477d4..a37d749ea 100644
--- a/postfix/src/postconf/test51.ref
+++ b/postfix/src/postconf/test51.ref
@@ -1 +1 @@
-./postconf: fatal: invalid wakeup field X?" in "bar inet - n n X? 0 other"
+./postconf: fatal: invalid wakeup field "X?" in "bar inet - n n X? 0 other"
diff --git a/postfix/src/postmap/postmap.c b/postfix/src/postmap/postmap.c
index b1e0eab2d..f4fd4ac2f 100644
--- a/postfix/src/postmap/postmap.c
+++ b/postfix/src/postmap/postmap.c
@@ -427,7 +427,8 @@ static void postmap(char *map_type, char *path_name, int postmap_flags,
if ((mkmap->dict->flags & DICT_FLAG_UTF8_ACTIVE)
&& !allascii(STR(line_buffer))
&& !valid_utf8_string(STR(line_buffer), LEN(line_buffer))) {
- msg_warn("%s, line %d: non-UTF-8 input \"%s\"",
+ msg_warn("%s, line %d: non-UTF-8 input \"%s\""
+ " -- ignoring this line",
VSTREAM_PATH(source_fp), lineno, STR(line_buffer));
continue;
}
diff --git a/postfix/src/tls/tls_client.c b/postfix/src/tls/tls_client.c
index fc3d607ca..f50936aac 100644
--- a/postfix/src/tls/tls_client.c
+++ b/postfix/src/tls/tls_client.c
@@ -573,8 +573,7 @@ static int match_servername(const char *certid,
*
* IDNA2008 does not permit (upper) case and other variant
* differences in U-labels. The midna_domain_to_ascii() function,
- * based on UTS46, midna_domain_to_ascii() normalizes the
- * differences away.
+ * based on UTS46, normalizes such differences away.
*
* The IDNA to_ASCII conversion does not allow empty leading labels,
* so we handle these explicitly here.
diff --git a/postfix/src/util/dict_alloc.c b/postfix/src/util/dict_alloc.c
index f4a8f9998..a528a3732 100644
--- a/postfix/src/util/dict_alloc.c
+++ b/postfix/src/util/dict_alloc.c
@@ -134,9 +134,7 @@ static void dict_default_close(DICT *dict)
DICT *dict_alloc(const char *dict_type, const char *dict_name, ssize_t size)
{
- extern int util_utf8_enable;
- DICT *dict = (DICT *) mymalloc(util_utf8_enable ?
- size + sizeof(DICT_UTF8_BACKUP) : size);
+ DICT *dict = (DICT *) mymalloc(size);
dict->type = mystrdup(dict_type);
dict->name = mystrdup(dict_name);
diff --git a/postfix/src/util/dict_open.c b/postfix/src/util/dict_open.c
index a18a6ce34..57df5e46d 100644
--- a/postfix/src/util/dict_open.c
+++ b/postfix/src/util/dict_open.c
@@ -156,7 +156,7 @@
/* and must trap exceptions from the database client with dict_setjmp().
/* .IP DICT_FLAG_DEBUG
/* Enable additional logging.
-/* .IP DICT_FLAG_UTF8_ENABLE
+/* .IP DICT_FLAG_UTF8_REQUEST
/* With util_utf8_enable != 0, require that lookup/update/delete
/* keys and values are valid UTF-8. Skip a lookup/update/delete
/* request with a non-UTF-8 key, skip an update request with
diff --git a/postfix/src/util/match_list.c b/postfix/src/util/match_list.c
index 36ee0902a..ecea8c1e6 100644
--- a/postfix/src/util/match_list.c
+++ b/postfix/src/util/match_list.c
@@ -46,7 +46,7 @@
/*
/* Arguments:
/* .IP pname
-/* Parameter name or other identiying information that is
+/* Parameter name or other identifying information that is
/* prepended to error messages.
/* .IP flags
/* Specifies the bit-wise OR of zero or more of the following: