Update for krb5-1.21.1

diff --git a/README b/README
index 7fdfe0e9110bc60c122fab06fce10355f5b91d0e..59f5f216b90c227012a1dcd47cc225f90a015341 100644 (file)
--- a/README
+++ b/README
@@ -97,6 +97,19 @@ removed.
 Beginning with the krb5-1.18 release, all support for single-DES
 encryption types has been removed.
 
+Major changes in 1.21.1 (2023-07-10)
+------------------------------------
+
+This is a bug fix release.
+
+* Fix potential uninitialized pointer free in kadm5 XDR parsing
+  [CVE-2023-36054].
+
+krb5-1.21.1 changes by ticket ID
+--------------------------------
+
+9099    Ensure array count consistency in kadm5 RPC
+
 Major changes in 1.21 (2023-06-05)
 ----------------------------------
 
@@ -432,6 +445,7 @@ reports, suggestions, and valuable resources:
     Paul Moore
     Keiichi Mori
     Michael Morony
+    Robert Morris
     Sam Morris
     Zbysek Mraz
     Edward Murrell

diff --git a/src/man/k5identity.man b/src/man/k5identity.man
index 710f37f0e41d22c8b1ebb0bd900e373ddbbddef9..1f4eff4b34701c321da924295c5c7a9b3784ce76 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.21" "MIT Kerberos"
+.TH "K5IDENTITY" "5" " " "1.21.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 7e42e113892117e5a0c4836de65176bbade05c32..e8d4b28c21b00584e87adca2674b4c490e3c349e 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.21" "MIT Kerberos"
+.TH "K5LOGIN" "5" " " "1.21.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 cc06191074ef7ad5f54c0c66ada63b55dd6854bb..bbd2bdd470878597dc4bdb8ae692c6bfe032354f 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.21" "MIT Kerberos"
+.TH "K5SRVUTIL" "1" " " "1.21.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 38b0b48f5f72412982ea70befdeced77c5597098..026af1f6b4e8f5a04f06d401b3dfb2219955afb8 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.21" "MIT Kerberos"
+.TH "KADM5.ACL" "5" " " "1.21.1" "MIT Kerberos"
 .SH NAME
 kadm5.acl \- Kerberos ACL file
 .

diff --git a/src/man/kadmin.man b/src/man/kadmin.man
index d028dc29755b45abd5f581c9a8197351a93e7b84..c29638a22772e4d574e06061ca596a8b37375513 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.21" "MIT Kerberos"
+.TH "KADMIN" "1" " " "1.21.1" "MIT Kerberos"
 .SH NAME
 kadmin \- Kerberos V5 database administration program
 .

diff --git a/src/man/kadmind.man b/src/man/kadmind.man
index a8a4b96902c8ab737e0d2faf7c3ef92c0fbcf888..f295e2c05ce171215f7787d574d48d91517ce2d9 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.21" "MIT Kerberos"
+.TH "KADMIND" "8" " " "1.21.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 4bda66eaa0344ca086a6184fcfadd9b654d7a9ec..c69be5a12c12ca249d87f483dc91459dacc01494 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.21" "MIT Kerberos"
+.TH "KDB5_LDAP_UTIL" "8" " " "1.21.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 6a853ae2021cc60b6e8b5564b2c0026a8b95473d..dac2e1277c124dd4cd73ac5e6755428195365900 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.21" "MIT Kerberos"
+.TH "KDB5_UTIL" "8" " " "1.21.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 5f17e950a17e441aab323d72cd9daad2776d599b..6cf7c35f59526dec3260360201dde904b0842d0f 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.21" "MIT Kerberos"
+.TH "KDC.CONF" "5" " " "1.21.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 e15ff236ed48bbf4fde53765343b07c9876d71b8..0cea8aebcef39b576b56d271e12a9a924c9726f8 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.21" "MIT Kerberos"
+.TH "KDESTROY" "1" " " "1.21.1" "MIT Kerberos"
 .SH NAME
 kdestroy \- destroy Kerberos tickets
 .

diff --git a/src/man/kerberos.man b/src/man/kerberos.man
index 654eb23cda414b630e3c3da9f4b5f9c2487721cf..01876f599a675cbf4bcb16b47dbcfbea82c8d68c 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.21" "MIT Kerberos"
+.TH "KERBEROS" "7" " " "1.21.1" "MIT Kerberos"
 .SH NAME
 kerberos \- Overview of using Kerberos
 .

diff --git a/src/man/kinit.man b/src/man/kinit.man
index 49c36d46de80c0108157d42a8287a4cfd407dd89..629226ca13b53bb3f96f8f18a1f66111a2fd70c3 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.21" "MIT Kerberos"
+.TH "KINIT" "1" " " "1.21.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 a23f77fc018a2104c96963c8a625b7f59d5a850a..186fb8dd6674e5fd8314a116f61106be4afeda70 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.21" "MIT Kerberos"
+.TH "KLIST" "1" " " "1.21.1" "MIT Kerberos"
 .SH NAME
 klist \- list cached Kerberos tickets
 .

diff --git a/src/man/kpasswd.man b/src/man/kpasswd.man
index ca9bc8dddeae793d6581540b799443b711a571f6..240724be92356fdb784840815a99094ffaacbbca 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.21" "MIT Kerberos"
+.TH "KPASSWD" "1" " " "1.21.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 a2f132f8e344e610fda625c7e59af9ae5364fdfc..3673678026468b5e68aec668fbb5f241e776cd3e 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.21" "MIT Kerberos"
+.TH "KPROP" "8" " " "1.21.1" "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 c606ef1a597d27c5af54a263e0da9a573ef30731..f173a2cf0347b102e52b2ad3dd757efac3569058 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.21" "MIT Kerberos"
+.TH "KPROPD" "8" " " "1.21.1" "MIT Kerberos"
 .SH NAME
 kpropd \- Kerberos V5 replica KDC update server
 .

diff --git a/src/man/kproplog.man b/src/man/kproplog.man
index 8e72dffb7e40974523c879a33e72e26d950976d5..b4b6773bb6c313ff15b3b4126b24fe28cae26fbc 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.21" "MIT Kerberos"
+.TH "KPROPLOG" "8" " " "1.21.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 5be9f6b0b67d2d293e57211da9bd18d22af5b79d..7dc632f11ae6be6edc2364ac5c3158cf44430e1f 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.21" "MIT Kerberos"
+.TH "KRB5-CONFIG" "1" " " "1.21.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 4a603fb089b95ccabeea403807947dc85c3b1db4..4e8773288d0b0838a5656112e203457206fead1a 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.21" "MIT Kerberos"
+.TH "KRB5.CONF" "5" " " "1.21.1" "MIT Kerberos"
 .SH NAME
 krb5.conf \- Kerberos configuration file
 .

diff --git a/src/man/krb5kdc.man b/src/man/krb5kdc.man
index f0dcd154418847338e25100611cf47a460630137..41b280049cc906de4843f297d4bab9411150d2b6 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.21" "MIT Kerberos"
+.TH "KRB5KDC" "8" " " "1.21.1" "MIT Kerberos"
 .SH NAME
 krb5kdc \- Kerberos V5 KDC
 .

diff --git a/src/man/ksu.man b/src/man/ksu.man
index eed720cbae37c13f75f40cf566033f7b3659158f..b322d0582cd974f7a948f1c194adbb7d0e69193d 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.21" "MIT Kerberos"
+.TH "KSU" "1" " " "1.21.1" "MIT Kerberos"
 .SH NAME
 ksu \- Kerberized super-user
 .

diff --git a/src/man/kswitch.man b/src/man/kswitch.man
index 3f35fec3d22fda0490c532a40de1a3a4b1750f28..6d11578ed6a5cd866c193079dd6aa23d6c5cb071 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.21" "MIT Kerberos"
+.TH "KSWITCH" "1" " " "1.21.1" "MIT Kerberos"
 .SH NAME
 kswitch \- switch primary ticket cache
 .

diff --git a/src/man/ktutil.man b/src/man/ktutil.man
index 85be01fe0ca4229b49fbe65982b83c2a5379bcea..c78705ce37b8af2053051b1b0cc780c3eff38b88 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.21" "MIT Kerberos"
+.TH "KTUTIL" "1" " " "1.21.1" "MIT Kerberos"
 .SH NAME
 ktutil \- Kerberos keytab file maintenance utility
 .

diff --git a/src/man/kvno.man b/src/man/kvno.man
index cd80ac47de68782dffecd101f4704697c7d5039c..0bbcb07f0c68875053a10d0105fc139e1a6e8f43 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.21" "MIT Kerberos"
+.TH "KVNO" "1" " " "1.21.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 c480dc9f709213b2bda29179d1db93bb65d48f37..e58788dc0b8fca7c57c2febbb882788bacdb7c82 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.21" "MIT Kerberos"
+.TH "SCLIENT" "1" " " "1.21.1" "MIT Kerberos"
 .SH NAME
 sclient \- sample Kerberos version 5 client
 .

diff --git a/src/man/sserver.man b/src/man/sserver.man
index 84f832fdfa2dea59661cd6181f4444e32d22fc15..95532b522e79d930f1c9a73d7ddb3c6031495585 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.21" "MIT Kerberos"
+.TH "SSERVER" "8" " " "1.21.1" "MIT Kerberos"
 .SH NAME
 sserver \- sample Kerberos version 5 server
 .

diff --git a/src/patchlevel.h b/src/patchlevel.h
index 574b997156d2fa05fb29bf208e27f4f096141db5..be6a309f53e0b65e9cb13041a9a929be475b1d6f 100644 (file)
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -51,7 +51,7 @@
  */
 #define KRB5_MAJOR_RELEASE 1
 #define KRB5_MINOR_RELEASE 21
-#define KRB5_PATCHLEVEL 0
-#define KRB5_RELTAIL "postrelease"
+#define KRB5_PATCHLEVEL 1
+/* #undef KRB5_RELTAIL */
 /* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "krb5-1.21"
+#define KRB5_RELTAG "krb5-1.21.1-final"

diff --git a/src/po/mit-krb5.pot b/src/po/mit-krb5.pot
index 3ec1ed677342ad37a1136a64f09e31acb530deb1..253d6a3911c45413b924620ecf365dd31f179cf1 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.21\n"
+"Project-Id-Version: mit-krb5 1.21.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-05 17:22-0400\n"
+"POT-Creation-Date: 2023-07-10 16:43-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"