28 files changed, 83 insertions, 30 deletions
diff --git a/README b/README
index 0f8a3fe..c1095a2 100644
--- a/README
+++ b/README
@@ -73,6 +73,55 @@ from using single-DES cryptosystems.  Among these is a configuration
 variable that enables "weak" enctypes, which defaults to "false"
 beginning with krb5-1.8.
 
+Major changes in 1.16.1 (2018-05-03)
+------------------------------------
+
+This is a bug fix release.
+
+* Fix flaws in LDAP DN checking, including a null dereference KDC
+  crash which could be triggered by kadmin clients with administrative
+  privileges [CVE-2018-5729, CVE-2018-5730].
+
+* Fix a KDC PKINIT memory leak.
+
+* Fix a small KDC memory leak on transited or authdata errors when
+  processing TGS requests.
+
+* Fix a regression in pkinit_cert_match matching of client
+  certificates containing Microsoft UPN SANs.
+
+* Fix a null dereference when the KDC sends a large TGS reply.
+
+* Fix "kdestroy -A" with the KCM credential cache type.
+
+* Allow validation of Microsoft PACs containing enterprise names.
+
+* Fix the handling of capaths "." values.
+
+* Fix handling of repeated subsection specifications in profile files
+  (such as when multiple included files specify relations in the same
+  subsection).
+
+krb5-1.16.1 changes by ticket ID
+--------------------------------
+
+7863	profile library mishandles duplicate subsections
+8622	Point to kerberos.org/dist
+8639	Always set appdefault_get() output argument
+8640	krb5 build
+8643	Fix flaws in LDAP DN checking
+8644	Fix memory leak in KDC PKINIT code
+8645	Fix KDC encrypting key memory leak on some errors
+8646	Fix capaths "." values on client
+8649	Allow validation of PACs with enterprise names
+8658	kdestroy -A fails with KCM ccache type
+8660	Document comments in krb5.conf
+8666	KDC null dereference when TGS reply is too big for UDP
+8669	Fix doubled "kadmind:" in kadmind fail_to_start()
+8670	Regression in rule-based matching of PKINIT client certs with UPN SANs
+8675	Set error message on KCM get_princ failure
+
+
 Major changes in 1.16 (2017-12-05)
 ----------------------------------
 
@@ -316,6 +365,7 @@ reports, suggestions, and valuable resources:
     Russell Allbery
     Brian Almeida
     Michael B Allen
+    Pooja Anil
     Heinz-Ado Arnolds
     Derek Atkins
     Mark Bannister
@@ -371,6 +421,7 @@ reports, suggestions, and valuable resources:
     JC Ferguson
     Remi Ferrand
     Paul Fertser
+    Fabiano Fidêncio
     William Fiveash
     Jacques Florent
     Ákos Frohner
@@ -451,6 +502,7 @@ reports, suggestions, and valuable resources:
     Zoran Pericic
     W. Michael Petullo
     Mark Phalan
+    Sharwan Ram
     Brett Randall
     Jonathan Reams
     Jonathan Reed
@@ -484,6 +536,7 @@ reports, suggestions, and valuable resources:
     John Washington
     Stef Walter
     Xi Wang
+    Nehal J Wani
     Kevin Wasserman
     Margaret Wasserman
     Marcus Watts
diff --git a/src/man/k5identity.man b/src/man/k5identity.man
index 7ca0e04..b12fe67 100644
--- a/src/man/k5identity.man
+++ b/src/man/k5identity.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "K5IDENTITY" "5" " " "1.16" "MIT Kerberos"
+.TH "K5IDENTITY" "5" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 k5identity \- Kerberos V5 client principal selection rules
 .
diff --git a/src/man/k5login.man b/src/man/k5login.man
index 99ecbb9..1ca11d3 100644
--- a/src/man/k5login.man
+++ b/src/man/k5login.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "K5LOGIN" "5" " " "1.16" "MIT Kerberos"
+.TH "K5LOGIN" "5" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 k5login \- Kerberos V5 acl file for host access
 .
diff --git a/src/man/k5srvutil.man b/src/man/k5srvutil.man
index 2169592..570aa43 100644
--- a/src/man/k5srvutil.man
+++ b/src/man/k5srvutil.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "K5SRVUTIL" "1" " " "1.16" "MIT Kerberos"
+.TH "K5SRVUTIL" "1" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 k5srvutil \- host key table (keytab) manipulation utility
 .
diff --git a/src/man/kadm5.acl.man b/src/man/kadm5.acl.man
index adeeaf5..49d6f81 100644
--- a/src/man/kadm5.acl.man
+++ b/src/man/kadm5.acl.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KADM5.ACL" "5" " " "1.16" "MIT Kerberos"
+.TH "KADM5.ACL" "5" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 kadm5.acl \- Kerberos ACL file
 .
diff --git a/src/man/kadmin.man b/src/man/kadmin.man
index a7d6459..a426b3a 100644
--- a/src/man/kadmin.man
+++ b/src/man/kadmin.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KADMIN" "1" " " "1.16" "MIT Kerberos"
+.TH "KADMIN" "1" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 kadmin \- Kerberos V5 database administration program
 .
diff --git a/src/man/kadmind.man b/src/man/kadmind.man
index c30eea7..411d3a0 100644
--- a/src/man/kadmind.man
+++ b/src/man/kadmind.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KADMIND" "8" " " "1.16" "MIT Kerberos"
+.TH "KADMIND" "8" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 kadmind \- KADM5 administration server
 .
diff --git a/src/man/kdb5_ldap_util.man b/src/man/kdb5_ldap_util.man
index cfc7266..0a0a99a 100644
--- a/src/man/kdb5_ldap_util.man
+++ b/src/man/kdb5_ldap_util.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KDB5_LDAP_UTIL" "8" " " "1.16" "MIT Kerberos"
+.TH "KDB5_LDAP_UTIL" "8" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 kdb5_ldap_util \- Kerberos configuration utility
 .
diff --git a/src/man/kdb5_util.man b/src/man/kdb5_util.man
index 93d4ba8..0c8478d 100644
--- a/src/man/kdb5_util.man
+++ b/src/man/kdb5_util.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KDB5_UTIL" "8" " " "1.16" "MIT Kerberos"
+.TH "KDB5_UTIL" "8" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 kdb5_util \- Kerberos database maintenance utility
 .
diff --git a/src/man/kdc.conf.man b/src/man/kdc.conf.man
index 8859c2a..f6bdc62 100644
--- a/src/man/kdc.conf.man
+++ b/src/man/kdc.conf.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KDC.CONF" "5" " " "1.16" "MIT Kerberos"
+.TH "KDC.CONF" "5" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 kdc.conf \- Kerberos V5 KDC configuration file
 .
diff --git a/src/man/kdestroy.man b/src/man/kdestroy.man
index fcfce90..5d793db 100644
--- a/src/man/kdestroy.man
+++ b/src/man/kdestroy.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KDESTROY" "1" " " "1.16" "MIT Kerberos"
+.TH "KDESTROY" "1" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 kdestroy \- destroy Kerberos tickets
 .
diff --git a/src/man/kinit.man b/src/man/kinit.man
index a629757..b992d4c 100644
--- a/src/man/kinit.man
+++ b/src/man/kinit.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KINIT" "1" " " "1.16" "MIT Kerberos"
+.TH "KINIT" "1" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 kinit \- obtain and cache Kerberos ticket-granting ticket
 .
diff --git a/src/man/klist.man b/src/man/klist.man
index 11badcc..682a292 100644
--- a/src/man/klist.man
+++ b/src/man/klist.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KLIST" "1" " " "1.16" "MIT Kerberos"
+.TH "KLIST" "1" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 klist \- list cached Kerberos tickets
 .
diff --git a/src/man/kpasswd.man b/src/man/kpasswd.man
index a8fbdb6..d9c5de8 100644
--- a/src/man/kpasswd.man
+++ b/src/man/kpasswd.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KPASSWD" "1" " " "1.16" "MIT Kerberos"
+.TH "KPASSWD" "1" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 kpasswd \- change a user's Kerberos password
 .
diff --git a/src/man/kprop.man b/src/man/kprop.man
index 9055a11..6a9daf0 100644
--- a/src/man/kprop.man
+++ b/src/man/kprop.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KPROP" "8" " " "1.16" "MIT Kerberos"
+.TH "KPROP" "8" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 kprop \- propagate a Kerberos V5 principal database to a slave server
 .
diff --git a/src/man/kpropd.man b/src/man/kpropd.man
index 2c5488f..a6920e3 100644
--- a/src/man/kpropd.man
+++ b/src/man/kpropd.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KPROPD" "8" " " "1.16" "MIT Kerberos"
+.TH "KPROPD" "8" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 kpropd \- Kerberos V5 slave KDC update server
 .
diff --git a/src/man/kproplog.man b/src/man/kproplog.man
index 6432c38..e495f1a 100644
--- a/src/man/kproplog.man
+++ b/src/man/kproplog.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KPROPLOG" "8" " " "1.16" "MIT Kerberos"
+.TH "KPROPLOG" "8" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 kproplog \- display the contents of the Kerberos principal update log
 .
diff --git a/src/man/krb5-config.man b/src/man/krb5-config.man
index 665d5de..c6b21fe 100644
--- a/src/man/krb5-config.man
+++ b/src/man/krb5-config.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KRB5-CONFIG" "1" " " "1.16" "MIT Kerberos"
+.TH "KRB5-CONFIG" "1" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 krb5-config \- tool for linking against MIT Kerberos libraries
 .
diff --git a/src/man/krb5.conf.man b/src/man/krb5.conf.man
index c54a500..ea73f50 100644
--- a/src/man/krb5.conf.man
+++ b/src/man/krb5.conf.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KRB5.CONF" "5" " " "1.16" "MIT Kerberos"
+.TH "KRB5.CONF" "5" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 krb5.conf \- Kerberos configuration file
 .
diff --git a/src/man/krb5kdc.man b/src/man/krb5kdc.man
index a36673b..2e2c889 100644
--- a/src/man/krb5kdc.man
+++ b/src/man/krb5kdc.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KRB5KDC" "8" " " "1.16" "MIT Kerberos"
+.TH "KRB5KDC" "8" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 krb5kdc \- Kerberos V5 KDC
 .
diff --git a/src/man/ksu.man b/src/man/ksu.man
index e9cee75..f2e5cfd 100644
--- a/src/man/ksu.man
+++ b/src/man/ksu.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KSU" "1" " " "1.16" "MIT Kerberos"
+.TH "KSU" "1" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 ksu \- Kerberized super-user
 .
diff --git a/src/man/kswitch.man b/src/man/kswitch.man
index 6b22005..1ac283c 100644
--- a/src/man/kswitch.man
+++ b/src/man/kswitch.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KSWITCH" "1" " " "1.16" "MIT Kerberos"
+.TH "KSWITCH" "1" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 kswitch \- switch primary ticket cache
 .
diff --git a/src/man/ktutil.man b/src/man/ktutil.man
index f4005f1..c17eac3 100644
--- a/src/man/ktutil.man
+++ b/src/man/ktutil.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KTUTIL" "1" " " "1.16" "MIT Kerberos"
+.TH "KTUTIL" "1" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 ktutil \- Kerberos keytab file maintenance utility
 .
diff --git a/src/man/kvno.man b/src/man/kvno.man
index 8d5b7b5..3335705 100644
--- a/src/man/kvno.man
+++ b/src/man/kvno.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KVNO" "1" " " "1.16" "MIT Kerberos"
+.TH "KVNO" "1" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 kvno \- print key version numbers of Kerberos principals
 .
diff --git a/src/man/sclient.man b/src/man/sclient.man
index 5c9ce00..96d2a73 100644
--- a/src/man/sclient.man
+++ b/src/man/sclient.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SCLIENT" "1" " " "1.16" "MIT Kerberos"
+.TH "SCLIENT" "1" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 sclient \- sample Kerberos version 5 client
 .
diff --git a/src/man/sserver.man b/src/man/sserver.man
index 42067ea..25b053d 100644
--- a/src/man/sserver.man
+++ b/src/man/sserver.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SSERVER" "8" " " "1.16" "MIT Kerberos"
+.TH "SSERVER" "8" " " "1.16.1" "MIT Kerberos"
 .SH NAME
 sserver \- sample Kerberos version 5 server
 .
diff --git a/src/patchlevel.h b/src/patchlevel.h
index 105efeb..cb6f367 100644
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -51,7 +51,7 @@
  */
 #define KRB5_MAJOR_RELEASE 1
 #define KRB5_MINOR_RELEASE 16
-#define KRB5_PATCHLEVEL 0
-#define KRB5_RELTAIL "postrelease"
+#define KRB5_PATCHLEVEL 1
+/* #undef KRB5_RELTAIL */
 /* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "krb5-1.16"
+#define KRB5_RELTAG "krb5-1.16.1-final"
diff --git a/src/po/mit-krb5.pot b/src/po/mit-krb5.pot
index 6d55ac0..3dc583a 100644
--- a/src/po/mit-krb5.pot
+++ b/src/po/mit-krb5.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: mit-krb5 1.16-postrelease\n"
+"Project-Id-Version: mit-krb5 1.16.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-02 18:12-0400\n"
+"POT-Creation-Date: 2018-05-03 10:33-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"