Update for krb5-1.18.4krb5-1.18.4-final

29 files changed, 56 insertions, 31 deletions

diff --git a/README b/README
index c6bd91d..62ab1ef 100644
--- a/README
+++ b/README
@@ -70,6 +70,27 @@ DES no longer supported
 Beginning with the krb5-1.18 release, single-DES encryption types are
 no longer supported.
 
+Major changes in 1.18.4 (2021-07-22)
+------------------------------------
+
+This is a bug fix release.
+
+* Fix a denial of service attack against the KDC encrypted challenge
+  code [CVE-2021-36222].
+
+* Fix a memory leak when gss_inquire_cred() is called without a
+  credential handle.
+
+krb5-1.18.4 changes by ticket ID
+--------------------------------
+
+8975    Incorrect runstatedir substitution affecting "make install"
+9005    Fix argument type errors on Windows
+9007    Fix KDC null deref on bad encrypted challenge
+9014    Using locking in MEMORY krb5_cc_get_principal()
+9015    Fix use-after-free during krad remote_shutdown()
+9016    Memory leak in krb5_gss_inquire_cred
+
 Major changes in 1.18.3 (2020-11-17)
 ------------------------------------
 
@@ -422,6 +443,7 @@ reports, suggestions, and valuable resources:
     Sumit Bose
     Emmanuel Bouillon
     Isaac Boukris
+    Pavel Březina
     Philip Brown
     Samuel Cabrero
     Michael Calmer
@@ -513,6 +535,7 @@ reports, suggestions, and valuable resources:
     Patrik Kis
     Martin Kittel
     Thomas Klausner
+    Tomasz Kłoczko
     Matthew Krupcale
     Mikkel Kruse
     Reinhard Kugler
@@ -594,11 +617,13 @@ reports, suggestions, and valuable resources:
     Michael Ströder
     Bjørn Tore Sund
     Ondřej Surý
+    Joseph Sutton
     Joe Travaglini
     Sergei Trofimovich
     Tim Uglow
     Rathor Vipin
     Denis Vlasenko
+    Thomas Wagner
     Jorgen Wahlsten
     Stef Walter
     Max (Weijun) Wang
diff --git a/src/man/k5identity.man b/src/man/k5identity.man
index c75f198..3f03348 100644
--- a/src/man/k5identity.man
+++ b/src/man/k5identity.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "K5IDENTITY" "5" " " "1.18.3" "MIT Kerberos"
+.TH "K5IDENTITY" "5" " " "1.18.4" "MIT Kerberos"
 .SH NAME
 k5identity \- Kerberos V5 client principal selection rules
 .
diff --git a/src/man/k5login.man b/src/man/k5login.man
index 0e7276f..75e1f59 100644
--- a/src/man/k5login.man
+++ b/src/man/k5login.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "K5LOGIN" "5" " " "1.18.3" "MIT Kerberos"
+.TH "K5LOGIN" "5" " " "1.18.4" "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 b7091ca..753c9b1 100644
--- a/src/man/k5srvutil.man
+++ b/src/man/k5srvutil.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "K5SRVUTIL" "1" " " "1.18.3" "MIT Kerberos"
+.TH "K5SRVUTIL" "1" " " "1.18.4" "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 4d8e21d..547b5bb 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.18.3" "MIT Kerberos"
+.TH "KADM5.ACL" "5" " " "1.18.4" "MIT Kerberos"
 .SH NAME
 kadm5.acl \- Kerberos ACL file
 .
diff --git a/src/man/kadmin.man b/src/man/kadmin.man
index 6843751..43ad704 100644
--- a/src/man/kadmin.man
+++ b/src/man/kadmin.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KADMIN" "1" " " "1.18.3" "MIT Kerberos"
+.TH "KADMIN" "1" " " "1.18.4" "MIT Kerberos"
 .SH NAME
 kadmin \- Kerberos V5 database administration program
 .
diff --git a/src/man/kadmind.man b/src/man/kadmind.man
index 8df0b4d..a4a23c1 100644
--- a/src/man/kadmind.man
+++ b/src/man/kadmind.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KADMIND" "8" " " "1.18.3" "MIT Kerberos"
+.TH "KADMIND" "8" " " "1.18.4" "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 4d30a6e..80fc771 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.18.3" "MIT Kerberos"
+.TH "KDB5_LDAP_UTIL" "8" " " "1.18.4" "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 c1ebbde..aa886cf 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.18.3" "MIT Kerberos"
+.TH "KDB5_UTIL" "8" " " "1.18.4" "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 877fc52..170685e 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.18.3" "MIT Kerberos"
+.TH "KDC.CONF" "5" " " "1.18.4" "MIT Kerberos"
 .SH NAME
 kdc.conf \- Kerberos V5 KDC configuration file
 .
diff --git a/src/man/kdestroy.man b/src/man/kdestroy.man
index c40fab1..1dd5fa2 100644
--- a/src/man/kdestroy.man
+++ b/src/man/kdestroy.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KDESTROY" "1" " " "1.18.3" "MIT Kerberos"
+.TH "KDESTROY" "1" " " "1.18.4" "MIT Kerberos"
 .SH NAME
 kdestroy \- destroy Kerberos tickets
 .
diff --git a/src/man/kerberos.man b/src/man/kerberos.man
index a843142..10c5474 100644
--- a/src/man/kerberos.man
+++ b/src/man/kerberos.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KERBEROS" "7" " " "1.18.3" "MIT Kerberos"
+.TH "KERBEROS" "7" " " "1.18.4" "MIT Kerberos"
 .SH NAME
 kerberos \- Overview of using Kerberos
 .
diff --git a/src/man/kinit.man b/src/man/kinit.man
index 9cc9dce..14379a5 100644
--- a/src/man/kinit.man
+++ b/src/man/kinit.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KINIT" "1" " " "1.18.3" "MIT Kerberos"
+.TH "KINIT" "1" " " "1.18.4" "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 6859fb7..bfa93f2 100644
--- a/src/man/klist.man
+++ b/src/man/klist.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KLIST" "1" " " "1.18.3" "MIT Kerberos"
+.TH "KLIST" "1" " " "1.18.4" "MIT Kerberos"
 .SH NAME
 klist \- list cached Kerberos tickets
 .
diff --git a/src/man/kpasswd.man b/src/man/kpasswd.man
index afc8191..e0e420a 100644
--- a/src/man/kpasswd.man
+++ b/src/man/kpasswd.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KPASSWD" "1" " " "1.18.3" "MIT Kerberos"
+.TH "KPASSWD" "1" " " "1.18.4" "MIT Kerberos"
 .SH NAME
 kpasswd \- change a user's Kerberos password
 .
diff --git a/src/man/kprop.man b/src/man/kprop.man
index 4c8602a..6f55cba 100644
--- a/src/man/kprop.man
+++ b/src/man/kprop.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KPROP" "8" " " "1.18.3" "MIT Kerberos"
+.TH "KPROP" "8" " " "1.18.4" "MIT Kerberos"
 .SH NAME
 kprop \- propagate a Kerberos V5 principal database to a replica server
 .
diff --git a/src/man/kpropd.man b/src/man/kpropd.man
index 62b9bc0..39cb3fa 100644
--- a/src/man/kpropd.man
+++ b/src/man/kpropd.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KPROPD" "8" " " "1.18.3" "MIT Kerberos"
+.TH "KPROPD" "8" " " "1.18.4" "MIT Kerberos"
 .SH NAME
 kpropd \- Kerberos V5 replica KDC update server
 .
diff --git a/src/man/kproplog.man b/src/man/kproplog.man
index ceb7010..4aab723 100644
--- a/src/man/kproplog.man
+++ b/src/man/kproplog.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KPROPLOG" "8" " " "1.18.3" "MIT Kerberos"
+.TH "KPROPLOG" "8" " " "1.18.4" "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 ee615f4..97799d5 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.18.3" "MIT Kerberos"
+.TH "KRB5-CONFIG" "1" " " "1.18.4" "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 2802161..e45056f 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.18.3" "MIT Kerberos"
+.TH "KRB5.CONF" "5" " " "1.18.4" "MIT Kerberos"
 .SH NAME
 krb5.conf \- Kerberos configuration file
 .
diff --git a/src/man/krb5kdc.man b/src/man/krb5kdc.man
index a84bbfa..1ad1ef6 100644
--- a/src/man/krb5kdc.man
+++ b/src/man/krb5kdc.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KRB5KDC" "8" " " "1.18.3" "MIT Kerberos"
+.TH "KRB5KDC" "8" " " "1.18.4" "MIT Kerberos"
 .SH NAME
 krb5kdc \- Kerberos V5 KDC
 .
diff --git a/src/man/ksu.man b/src/man/ksu.man
index cde6997..93e55ca 100644
--- a/src/man/ksu.man
+++ b/src/man/ksu.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KSU" "1" " " "1.18.3" "MIT Kerberos"
+.TH "KSU" "1" " " "1.18.4" "MIT Kerberos"
 .SH NAME
 ksu \- Kerberized super-user
 .
diff --git a/src/man/kswitch.man b/src/man/kswitch.man
index 5a711fe..b957712 100644
--- a/src/man/kswitch.man
+++ b/src/man/kswitch.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KSWITCH" "1" " " "1.18.3" "MIT Kerberos"
+.TH "KSWITCH" "1" " " "1.18.4" "MIT Kerberos"
 .SH NAME
 kswitch \- switch primary ticket cache
 .
diff --git a/src/man/ktutil.man b/src/man/ktutil.man
index 9b5e2c3..5f14316 100644
--- a/src/man/ktutil.man
+++ b/src/man/ktutil.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KTUTIL" "1" " " "1.18.3" "MIT Kerberos"
+.TH "KTUTIL" "1" " " "1.18.4" "MIT Kerberos"
 .SH NAME
 ktutil \- Kerberos keytab file maintenance utility
 .
diff --git a/src/man/kvno.man b/src/man/kvno.man
index 0cf4f6f..4777ef7 100644
--- a/src/man/kvno.man
+++ b/src/man/kvno.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "KVNO" "1" " " "1.18.3" "MIT Kerberos"
+.TH "KVNO" "1" " " "1.18.4" "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 d695651..d3c3ffc 100644
--- a/src/man/sclient.man
+++ b/src/man/sclient.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SCLIENT" "1" " " "1.18.3" "MIT Kerberos"
+.TH "SCLIENT" "1" " " "1.18.4" "MIT Kerberos"
 .SH NAME
 sclient \- sample Kerberos version 5 client
 .
diff --git a/src/man/sserver.man b/src/man/sserver.man
index f0ce5d3..53f29fe 100644
--- a/src/man/sserver.man
+++ b/src/man/sserver.man
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SSERVER" "8" " " "1.18.3" "MIT Kerberos"
+.TH "SSERVER" "8" " " "1.18.4" "MIT Kerberos"
 .SH NAME
 sserver \- sample Kerberos version 5 server
 .
diff --git a/src/patchlevel.h b/src/patchlevel.h
index 0026325..48f8bd3 100644
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -51,7 +51,7 @@
  */
 #define KRB5_MAJOR_RELEASE 1
 #define KRB5_MINOR_RELEASE 18
-#define KRB5_PATCHLEVEL 3
-#define KRB5_RELTAIL "postrelease"
+#define KRB5_PATCHLEVEL 4
+/* #undef KRB5_RELTAIL */
 /* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "krb5-1.18"
+#define KRB5_RELTAG "krb5-1.18.4-final"
diff --git a/src/po/mit-krb5.pot b/src/po/mit-krb5.pot
index bc0ff14..6598297 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.18.3-postrelease\n"
+"Project-Id-Version: mit-krb5 1.18.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-22 17:50-0400\n"
+"POT-Creation-Date: 2021-07-22 18:48-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"