Update for krb5-1.18.4

diff --git a/README b/README
index c6bd91d168bb69eec019ef5a06a90b2fc78db443..62ab1efe9c145a0caa332715646fc58aa6989ca0 100644 (file)
--- 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 c75f198363b28f9b84628db1638525cd6d3ec904..3f03348bd2d72253c9e1e314c5cf0cc773105e77 100644 (file)
--- 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 0e7276f372ae0e941d77d97f5131044626f1560e..75e1f59d83bc628a616083ef96506b5680bd283e 100644 (file)
--- 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 b7091cae2227a079208a4aaef8e96db85067b81b..753c9b1c29409cea3c94ff3be0d30b77bdbc87d3 100644 (file)
--- 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 4d8e21d7a9ef48f1304da0c95cf0044923cc6c8e..547b5bb28e704a9b4aa170e3023955b33316f4ae 100644 (file)
--- 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 684375119554af022a66f417f315c1f470325de0..43ad70460eab09fdb0f9bcc25806ed8a2ba82d87 100644 (file)
--- 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 8df0b4d8033812d57bde2e22b228ff50c5a42745..a4a23c187598f3c879f14be3e18e88e625c974d8 100644 (file)
--- 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 4d30a6ee710e3a1bd1803c6796f2a18961370b88..80fc77126a518ca7dcfcfc9f7faef340893197bf 100644 (file)
--- 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 c1ebbde2729a6bf10bcdce86af344f4f264e4b3c..aa886cf74c83d226b9374f989a9e860a276cc87e 100644 (file)
--- 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 877fc524388e4b2d66cde23e005cffe78ac4d76a..170685e7ae0a314a525a45fba3dcd21bdde374d4 100644 (file)
--- 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 c40fab13fa4c576ffa406383c13ef7669fd8e629..1dd5fa2331c7bddfe0d871ed275b2e589843c388 100644 (file)
--- 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 a843142ec2149f1aa67ba457b442f8d1d2409120..10c5474a3cb92114a09da71bd9acf4fbfeaba657 100644 (file)
--- 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 9cc9dceb4b9847c9613b9a5e80e2a8f75268acb1..14379a5dfc5af429a22f7c58e593ace0b3b7a586 100644 (file)
--- 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 6859fb76d6ab0655843dfe5a56006198ff2e6be7..bfa93f2cf23faee79fb5891635bb95c79475d957 100644 (file)
--- 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 afc819193548fee95c1096abf4e3e6d2af71c5e6..e0e420aa68aa6cf5cbe0ad11bc29a0a3cce80d36 100644 (file)
--- 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 4c8602acd095b33a3b13521a5a1d6f421593aa3e..6f55cbad2c53a98717a4df31ab5c0ead55b03e44 100644 (file)
--- 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 62b9bc0ebacf14bc39eb4ad7320c1f7a6dc2d0ac..39cb3fa22a13e0863143dab1c7bb995e9b4b831b 100644 (file)
--- 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 ceb70106c8b75786d47397275c00590f19903a18..4aab723bfaaaec83d90c5947af06afa9293c0518 100644 (file)
--- 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 ee615f42d571da3443e6c611fb603557ff2cadeb..97799d5ef995f78d75984885bb2c629183b241b7 100644 (file)
--- 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 2802161e7a41f6125c3d7860f6059fa68d1479b8..e45056fd24144c293515ee421b4180c18282862e 100644 (file)
--- 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 a84bbfa593825aec409edb0397e20dd63ab321dd..1ad1ef63642c9f848e1cf4f62977522454d17531 100644 (file)
--- 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 cde69975be433f41b57c8f65989f8316e3ca34a8..93e55caf51b93a816acb73c1f4869220abdc2103 100644 (file)
--- 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 5a711fe35aa18de564cfe4884c061a6c41402926..b9577123b49986f6ac6d5c448301284f92c4c97b 100644 (file)
--- 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 9b5e2c3c57fc1d551dd988a64440add6bb585ade..5f143164a4ac02fc274552c90e15799fd5d3ef5d 100644 (file)
--- 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 0cf4f6f1c71ab8bf23e0a30191b64517669f206f..4777ef71364205551d8084e4df24b54893b25f29 100644 (file)
--- 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 d6956510ceeb2aff88a669215e18af9e143c3cf6..d3c3ffc063352e5020c1edafccd810d1d3d1a1eb 100644 (file)
--- 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 f0ce5d3a6422a2e1b3b0960ba1b09d42e22bb1fc..53f29fe6847b7e30718bead5d6b380008220146b 100644 (file)
--- 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 0026325c269c3c18891ed9a627c59278854a5bbe..48f8bd35dd8d86e2aa721f13a96b735d4a0c9119 100644 (file)
--- 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 bc0ff14afe78e92aebd8b7ffebf6123c3d2ea524..65982977514b684ecaed1dbca1fa0fcba695e18f 100644 (file)
--- 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"