postfix-3.1-20150711

postfix/HISTORY

@@ -21761,7 +21761,7 @@ Apologies for any names omitted.
 20150529
 
 	Support for DNS reply TTL values in dnsblog and postscreen.
-	Files: dbsblog/dnsblog.c, postscreen/postscreen_early.c,
+	Files: dnsblog/dnsblog.c, postscreen/postscreen_early.c,
 	postscreen/postscreen_dnsbl.c.
 
 20150607
@@ -21806,3 +21806,9 @@ Apologies for any names omitted.
 	Workaround: some DNS servers reply with NXDOMAIN for type
 	NS queries with names that actually have an A record. This
 	broke check_mumble_ns_access.  File: smtpd/smtpd_check.c.
+
+20150711
+
+	Workaround: conditional time default value can result in
+	multiple time unit suffixes. Files: global/conv_time.c
+	global/mail_conf_time.c.

postfix/RELEASE_NOTES

@@ -56,7 +56,7 @@ a default value for the new postscreen_dnsbl_max_ttl parameter.
 Destination-independent delivery rate delay
 -------------------------------------------
 
-Support to enforce a destination-independent delay between meail
+Support to enforce a destination-independent delay between email
 deliveries.  The following example inserts 20 seconds of delay
 between deliveries with the SMTP transport, limiting the delivery
 rate to at most three messages per minute.

postfix/src/global/conv_time.c

@@ -68,7 +68,7 @@ int     conv_time(const char *strval, int *timval, int def_unit)
     errno = 0;
     intval = longval = strtol(strval, &end, 10);
     if (*strval == 0 || errno == ERANGE || longval != intval || intval < 0
-	|| (*end != 0 && end[1] != 0))
+	/* || (*end != 0 && end[1] != 0) */)
 	return (0);
 
     switch (*end ? *end : def_unit) {

postfix/src/global/mail_conf_time.c

@@ -133,9 +133,11 @@ static int get_def_time_unit(const char *name, const char *defval)
 	    msg_panic("parameter %s: missing time unit in default value: %s",
 		      name, defval);
 	if (ISALPHA(*cp)) {
+#if 0
 	    if (cp[1] != 0)
 		msg_panic("parameter %s: bad time unit in default value: %s",
 			  name, defval);
+#endif
 	    return (*cp);
 	}
     }

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	"20150710"
+#define MAIL_RELEASE_DATE	"20150711"
 #define MAIL_VERSION_NUMBER	"3.1"
 
 #ifdef SNAPSHOT