diff --git a/postfix/HISTORY b/postfix/HISTORY
index 09f3a9354..6db1f677a 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -23171,3 +23171,9 @@ Apologies for any names omitted.
some sites with "TLSA 2 X X" records associated with an
intermediate CA certificate. Problem report and initial
fix by Erwan Legrand. File: src/tls/tls_dane.c.
+
+20171024
+
+ Bugfix (introduced: Postfix 3.0) missing dynamicmaps support
+ in the Postfix sendmail command broke authorized_submit_users
+ with a dynamically-loaded map type. File: sendmail/sendmail.c.
diff --git a/postfix/html/mailq.1.html b/postfix/html/mailq.1.html
index 802169364..fa4e4828a 100644
--- a/postfix/html/mailq.1.html
+++ b/postfix/html/mailq.1.html
@@ -434,7 +434,7 @@ SENDMAIL(1) SENDMAIL(1)
alternate_config_directories (empty)
A list of non-default Postfix configuration directories that may
be specified with "-c config_directory" on the command line (in
- the case of sendmail(1), with "-C config_directory"), or via the
+ the case of sendmail(1), with the "-C" option), or via the
MAIL_CONFIG environment parameter.
multi_instance_directories (empty)
diff --git a/postfix/html/newaliases.1.html b/postfix/html/newaliases.1.html
index 802169364..fa4e4828a 100644
--- a/postfix/html/newaliases.1.html
+++ b/postfix/html/newaliases.1.html
@@ -434,7 +434,7 @@ SENDMAIL(1) SENDMAIL(1)
alternate_config_directories (empty)
A list of non-default Postfix configuration directories that may
be specified with "-c config_directory" on the command line (in
- the case of sendmail(1), with "-C config_directory"), or via the
+ the case of sendmail(1), with the "-C" option), or via the
MAIL_CONFIG environment parameter.
multi_instance_directories (empty)
diff --git a/postfix/html/sendmail.1.html b/postfix/html/sendmail.1.html
index 802169364..fa4e4828a 100644
--- a/postfix/html/sendmail.1.html
+++ b/postfix/html/sendmail.1.html
@@ -434,7 +434,7 @@ SENDMAIL(1) SENDMAIL(1)
alternate_config_directories (empty)
A list of non-default Postfix configuration directories that may
be specified with "-c config_directory" on the command line (in
- the case of sendmail(1), with "-C config_directory"), or via the
+ the case of sendmail(1), with the "-C" option), or via the
MAIL_CONFIG environment parameter.
multi_instance_directories (empty)
diff --git a/postfix/man/man1/sendmail.1 b/postfix/man/man1/sendmail.1
index 091f053ff..e51ed4c2f 100644
--- a/postfix/man/man1/sendmail.1
+++ b/postfix/man/man1/sendmail.1
@@ -416,7 +416,7 @@ Postfix 3.2 and later:
.IP "\fBalternate_config_directories (empty)\fR"
A list of non\-default Postfix configuration directories that may
be specified with "\-c config_directory" on the command line (in the
-case of \fBsendmail\fR(1), with "\-C config_directory"), or via the MAIL_CONFIG
+case of \fBsendmail\fR(1), with the "\-C" option), or via the MAIL_CONFIG
environment parameter.
.IP "\fBmulti_instance_directories (empty)\fR"
An optional list of non\-default Postfix configuration directories;
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 7cc70aed7..3844757a1 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 "20171009"
+#define MAIL_RELEASE_DATE "20171028"
#define MAIL_VERSION_NUMBER "3.3"
#ifdef SNAPSHOT
diff --git a/postfix/src/sendmail/Makefile.in b/postfix/src/sendmail/Makefile.in
index 83fa93bb9..ee023f434 100644
--- a/postfix/src/sendmail/Makefile.in
+++ b/postfix/src/sendmail/Makefile.in
@@ -73,6 +73,7 @@ sendmail.o: ../../include/header_opts.h
sendmail.o: ../../include/htable.h
sendmail.o: ../../include/iostuff.h
sendmail.o: ../../include/mail_conf.h
+sendmail.o: ../../include/mail_dict.h
sendmail.o: ../../include/mail_flush.h
sendmail.o: ../../include/mail_params.h
sendmail.o: ../../include/mail_parm_split.h
diff --git a/postfix/src/sendmail/sendmail.c b/postfix/src/sendmail/sendmail.c
index d63caaf60..5f6809c3c 100644
--- a/postfix/src/sendmail/sendmail.c
+++ b/postfix/src/sendmail/sendmail.c
@@ -388,7 +388,7 @@
/* .IP "\fBalternate_config_directories (empty)\fR"
/* A list of non-default Postfix configuration directories that may
/* be specified with "-c config_directory" on the command line (in the
-/* case of \fBsendmail\fR(1), with "-C config_directory"), or via the MAIL_CONFIG
+/* case of \fBsendmail\fR(1), with the "-C" option), or via the MAIL_CONFIG
/* environment parameter.
/* .IP "\fBmulti_instance_directories (empty)\fR"
/* An optional list of non-default Postfix configuration directories;
@@ -495,6 +495,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1114,6 +1115,8 @@ int main(int argc, char **argv)
msg_syslog_init(mail_task("sendmail"), LOG_PID, LOG_FACILITY);
get_mail_conf_str_table(str_table);
+ mail_dict_init();
+
if (chdir(var_queue_dir))
msg_fatal_status(EX_UNAVAILABLE, "chdir %s: %m", var_queue_dir);