Update for krb5-1.15.4

diff --git a/README b/README
index b069651308d733c5c787a2280eb13aaf8fb967ca..61272a97cd8fdd1b920e8ef755f572427e294c74 100644 (file)
--- a/README
+++ b/README
@@ -73,6 +73,43 @@ 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.15.4 (2018-11-01)
+------------------------------------
+
+This is a bug fix release.
+
+* Fix bugs with concurrent use of MEMORY ccache handles.
+
+* Fix a KDC crash when falling back between multiple OTP tokens
+  configured for a principal entry.
+
+* Fix memory bugs when gss_add_cred() is used to create a new
+  credential, and fix a bug where it ignores the desired_name.
+
+* Fix the behavior of gss_inquire_cred_by_mech() when the credential
+  does not contain an element of the requested mechanism.
+
+* Make cross-realm S4U2Self requests work on the client when no
+  default_realm is configured.
+
+krb5-1.15.4 changes by ticket ID
+--------------------------------
+
+8202    memory ccache cursors are invalidated by initialize
+8677    Escape curly braces in def-check.pl regexes
+8684    Fix option parsing on Windows
+8704    Resource leak in read_secret_file()
+8708    Incorrect error handling in OTP plugin
+8727    Check strdup return in kadm5_get_config_params()
+8729    Memory leak in gss_add_cred() creation case
+8734    gss_add_cred() aliases memory when creating extended cred
+8736    Check mech cred in gss_inquire_cred_by_mech()
+8737    gss_add_cred() ignores desired_name if creating a new credential
+8741    S4U2Self client code fails with no default realm
+8743    Fix incorrect TRACE usages to use {str}
+8759    Resource leak in kadm5_randkey_principal_3()
+
+
 Major changes in 1.15.3 (2018-05-03)
 ------------------------------------
 
@@ -545,12 +582,14 @@ reports, suggestions, and valuable resources:
     Jan iankko Lieskovsky
     Todd Lipcon
     Oliver Loch
+    Chris Long
     Kevin Longfellow
     Frank Lonigro
     Jon Looney
     Nuno Lopes
     Ryan Lynch
     Roland Mainz
+    Sorin Manolache
     Andrei Maslennikov
     Michael Mattioli
     Nathaniel McCallum
@@ -622,6 +661,7 @@ reports, suggestions, and valuable resources:
     Neng Xue
     Zhaomo Yang
     Nickolai Zeldovich
+    Bean Zhang
     Hanz van Zijst
     Gertjan Zwartjes
 

diff --git a/src/man/k5identity.man b/src/man/k5identity.man
index 4a351c13cf95a6ed0cfce2b1578258dbb232f101..bba3c14cbf9a4c714336288abf4fab016b49431e 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.15.3" "MIT Kerberos"
+.TH "K5IDENTITY" "5" " " "1.15.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 ab1e79a3715a13fa1b9847c9fca5c998101f090d..b750d7fd01c7da7158df8038c83936989d559d25 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.15.3" "MIT Kerberos"
+.TH "K5LOGIN" "5" " " "1.15.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 21c86fa58a72446a3ba22995fc9866b09ab4eaeb..366c5af129ba9030b8f3884747ae2301340acb92 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.15.3" "MIT Kerberos"
+.TH "K5SRVUTIL" "1" " " "1.15.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 f28501315458b58f1338795ed0258aa1583f28f0..cd02b2688a42a7165fffba69428ba1f0e9e19efc 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.15.3" "MIT Kerberos"
+.TH "KADM5.ACL" "5" " " "1.15.4" "MIT Kerberos"
 .SH NAME
 kadm5.acl \- Kerberos ACL file
 .

diff --git a/src/man/kadmin.man b/src/man/kadmin.man
index 41cac1537fb329715f20f67bbc7d3620cc68aba1..0396b4cc5759089ddf2bcc1d1ce7deda62b772be 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.15.3" "MIT Kerberos"
+.TH "KADMIN" "1" " " "1.15.4" "MIT Kerberos"
 .SH NAME
 kadmin \- Kerberos V5 database administration program
 .

diff --git a/src/man/kadmind.man b/src/man/kadmind.man
index 85af67271a3e671f632f557af6fe354bb9002fb6..4a5ad29fdfe452c4309e7aa4ae9f91356428736a 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.15.3" "MIT Kerberos"
+.TH "KADMIND" "8" " " "1.15.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 65dd7990d727ca76d0211f8f765a6ce5a413a23c..5cd5cc18c32c28e45b18bb934ac6459169299a36 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.15.3" "MIT Kerberos"
+.TH "KDB5_LDAP_UTIL" "8" " " "1.15.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 7d14e8562bb820844ebb02d2f6427bf76f4e12b7..370276f7207216b9b5cbe97a8e400a85c92b54d3 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.15.3" "MIT Kerberos"
+.TH "KDB5_UTIL" "8" " " "1.15.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 3420527237f883ebd1fd957b3a4331e41f17ace7..cc784a17f185d454340ca4ddd56fe407030cf50b 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.15.3" "MIT Kerberos"
+.TH "KDC.CONF" "5" " " "1.15.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 0ee8e94d38b891cb0d9ee3a7acc1f571ea98cff1..99970f4f158d11b65c9a25517c3cd398e01b0e2b 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.15.3" "MIT Kerberos"
+.TH "KDESTROY" "1" " " "1.15.4" "MIT Kerberos"
 .SH NAME
 kdestroy \- destroy Kerberos tickets
 .

diff --git a/src/man/kinit.man b/src/man/kinit.man
index 8fcc9eb155d792c7d85ddcc8feb5eecb2feb73e1..faff112f52f937974e15d8d27f8a06d717ccd081 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.15.3" "MIT Kerberos"
+.TH "KINIT" "1" " " "1.15.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 edde6ce637aa9b2f2d18f6374ca51e4eeb904595..34bfa1bb23e8e3ae9c5e0328cd58de48b9a2ffe5 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.15.3" "MIT Kerberos"
+.TH "KLIST" "1" " " "1.15.4" "MIT Kerberos"
 .SH NAME
 klist \- list cached Kerberos tickets
 .

diff --git a/src/man/kpasswd.man b/src/man/kpasswd.man
index a0895fc6f9a0ef65b30643d7d59b1bd600e198f9..04bb72a74d4284120ec27124e7136aa56daf38b7 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.15.3" "MIT Kerberos"
+.TH "KPASSWD" "1" " " "1.15.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 9e161f46e5b23f1c05ebd2b9912b02cb528d3ed9..18ae91ff95ef9d2ae5a80c3c1fb09a22817102ba 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.15.3" "MIT Kerberos"
+.TH "KPROP" "8" " " "1.15.4" "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 36aa9f7397b1d6a3c4041e1144bf98f10993a47f..c6a2ee9e2937232dbaaabbdbc658590073ee5d40 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.15.3" "MIT Kerberos"
+.TH "KPROPD" "8" " " "1.15.4" "MIT Kerberos"
 .SH NAME
 kpropd \- Kerberos V5 slave KDC update server
 .

diff --git a/src/man/kproplog.man b/src/man/kproplog.man
index e0b200b9a69c09ef7caf88e870542d6078568df8..7966c2ae094aba509f616a1505d7626889be00fe 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.15.3" "MIT Kerberos"
+.TH "KPROPLOG" "8" " " "1.15.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 370cbd112f0bd113417df0ddd4de80e8bc615c98..d74014e6297f77babb18551d375224a9d0df7cdc 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.15.3" "MIT Kerberos"
+.TH "KRB5-CONFIG" "1" " " "1.15.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 e7f1b46e461d446e89f68be263fd7feb5dccaa7d..ecfe8698cd8f45e16d5b84d4ccc15aae11ce3f6e 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.15.3" "MIT Kerberos"
+.TH "KRB5.CONF" "5" " " "1.15.4" "MIT Kerberos"
 .SH NAME
 krb5.conf \- Kerberos configuration file
 .

diff --git a/src/man/krb5kdc.man b/src/man/krb5kdc.man
index 1f694912a7959baf43bdc3884bdd5f87fae19311..db149daa9486f8695d7cf17ca892c1021c084990 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.15.3" "MIT Kerberos"
+.TH "KRB5KDC" "8" " " "1.15.4" "MIT Kerberos"
 .SH NAME
 krb5kdc \- Kerberos V5 KDC
 .

diff --git a/src/man/ksu.man b/src/man/ksu.man
index 05549f4d65638934223ea449156e2d2ba330c527..80e4a8f474bfb49dc893c02fa477e51a0f0ac6a1 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.15.3" "MIT Kerberos"
+.TH "KSU" "1" " " "1.15.4" "MIT Kerberos"
 .SH NAME
 ksu \- Kerberized super-user
 .

diff --git a/src/man/kswitch.man b/src/man/kswitch.man
index 75fe17d8a7146173efa9b09e85d4c0e700a2c6c1..ac487bbbf6ae3ebba8ead9f16954971f761112f1 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.15.3" "MIT Kerberos"
+.TH "KSWITCH" "1" " " "1.15.4" "MIT Kerberos"
 .SH NAME
 kswitch \- switch primary ticket cache
 .

diff --git a/src/man/ktutil.man b/src/man/ktutil.man
index d0a040b4ca86ecf8bd2c5806e6a32136562077e7..4c525556e9880fd6003781786650a4eb91d90b89 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.15.3" "MIT Kerberos"
+.TH "KTUTIL" "1" " " "1.15.4" "MIT Kerberos"
 .SH NAME
 ktutil \- Kerberos keytab file maintenance utility
 .

diff --git a/src/man/kvno.man b/src/man/kvno.man
index 57be7daffdad6eddb80e68f9b2c781bde51b2808..4ff7d609e1ceb218478c1144d3e03b514b89317d 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.15.3" "MIT Kerberos"
+.TH "KVNO" "1" " " "1.15.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 2f4fb6e8af58bc7967007464436bab7de1639fe1..3db7dd12ae88abfa409f952481641efa96f906af 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.15.3" "MIT Kerberos"
+.TH "SCLIENT" "1" " " "1.15.4" "MIT Kerberos"
 .SH NAME
 sclient \- sample Kerberos version 5 client
 .

diff --git a/src/man/sserver.man b/src/man/sserver.man
index f6f45623c7aa968e2b5e89165ecf9d858ecbf749..e35b4cd9758a0b886b9da902e807a0ceccfcb5da 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.15.3" "MIT Kerberos"
+.TH "SSERVER" "8" " " "1.15.4" "MIT Kerberos"
 .SH NAME
 sserver \- sample Kerberos version 5 server
 .

diff --git a/src/patchlevel.h b/src/patchlevel.h
index 46a2c1cbfd5ad333ee818d8317ff05f40ad1a283..983171014a2e45c7603d39a267d8ad48fce9e58c 100644 (file)
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -51,7 +51,7 @@
  */
 #define KRB5_MAJOR_RELEASE 1
 #define KRB5_MINOR_RELEASE 15
-#define KRB5_PATCHLEVEL 3
-#define KRB5_RELTAIL "postrelease"
+#define KRB5_PATCHLEVEL 4
+/* #undef KRB5_RELTAIL */
 /* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "krb5-1.15"
+#define KRB5_RELTAG "krb5-1.15.4-final"

diff --git a/src/po/mit-krb5.pot b/src/po/mit-krb5.pot
index f7283a54c8f2bce87bb47d9b236618f53a77064d..7ef594bbf41615908b4d749419e69afbff91a066 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.15.3-postrelease\n"
+"Project-Id-Version: mit-krb5 1.15.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-01 18:23-0400\n"
+"POT-Creation-Date: 2018-11-01 18:36-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"