Drop krb5_realm_compare() etc. NULL check patches

Add-dns_canonicalize_hostname-fallback-support.patch

@@ -1,4 +1,4 @@
-From f256aeea76ad81305d005d3a052e7d2e0250dccc Mon Sep 17 00:00:00 2001
+From 770a525f940a319b4f9a91423a9f48bde28429b9 Mon Sep 17 00:00:00 2001
 From: Simo Sorce <simo@redhat.com>
 Date: Tue, 4 Dec 2018 15:22:55 -0500
 Subject: [PATCH] Add dns_canonicalize_hostname=fallback support

Add-function-and-enctype-flag-for-deprecations.patch

@@ -1,4 +1,4 @@
-From 81fe68ce11a676f93c101ddd7523e8de9b419deb Mon Sep 17 00:00:00 2001
+From 0713281743627e32f234e55bdaaeb58b37036675 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 15 Jan 2019 16:16:57 -0500
 Subject: [PATCH] Add function and enctype flag for deprecations

Add-tests-for-KCM-ccache-type.patch

@@ -1,4 +1,4 @@
-From deedc59d6ab6dd4f988db931a3a0d43f977ca708 Mon Sep 17 00:00:00 2001
+From b8be4f3272dcca4b34f9d79b47b88e510e0d4926 Mon Sep 17 00:00:00 2001
 From: Greg Hudson <ghudson@mit.edu>
 Date: Thu, 22 Nov 2018 00:27:35 -0500
 Subject: [PATCH] Add tests for KCM ccache type

Address-some-optimized-out-memset-calls.patch

@@ -1,4 +1,4 @@
-From 3909d11478c7bbfc988b5c09ed7b2d32a5959947 Mon Sep 17 00:00:00 2001
+From 31df8a3ef6b01b11a5956e16206069907a7acf17 Mon Sep 17 00:00:00 2001
 From: Greg Hudson <ghudson@mit.edu>
 Date: Sun, 30 Dec 2018 16:40:28 -0500
 Subject: [PATCH] Address some optimized-out memset() calls

Avoid-alignment-warnings-in-openssl-rc4.c.patch

@@ -1,4 +1,4 @@
-From 041a4f3507ffe9f19bb69f8c1959230753b73f90 Mon Sep 17 00:00:00 2001
+From dac87fb5d866251731ba524053d55482bf5fad2a Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Mon, 6 May 2019 15:14:49 -0400
 Subject: [PATCH] Avoid alignment warnings in openssl rc4.c

Avoid-allocating-a-register-in-zap-assembly.patch

@@ -1,4 +1,4 @@
-From e66fc8b903cded3aed007310815a8f1fac7e6c30 Mon Sep 17 00:00:00 2001
+From 087dd4f2cfde763b3b4ac1e34de87a3b9217037f Mon Sep 17 00:00:00 2001
 From: Andreas Schneider <asn@samba.org>
 Date: Thu, 3 Jan 2019 17:19:32 +0100
 Subject: [PATCH] Avoid allocating a register in zap() assembly

Check-more-errors-in-OpenSSL-crypto-backend.patch

@@ -1,4 +1,4 @@
-From f48e578e443cf0217360dee6cef1fe2869059be4 Mon Sep 17 00:00:00 2001
+From 43fa850e47233f95c429c5b06fc74130a9c2b2b1 Mon Sep 17 00:00:00 2001
 From: Greg Hudson <ghudson@mit.edu>
 Date: Mon, 22 Apr 2019 14:26:42 -0400
 Subject: [PATCH] Check more errors in OpenSSL crypto backend

Clarify-header-comment-for-krb5_cc_start_seq_get.patch

@@ -1,4 +1,4 @@
-From b804c5ec00580cf62fd3660939f0f3baf71822fe Mon Sep 17 00:00:00 2001
+From f6f799d2581251529c28bbb4644e42e19c6980ab Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 2 Apr 2019 14:18:57 -0400
 Subject: [PATCH] Clarify header comment for krb5_cc_start_seq_get()

Clear-forwardable-flag-instead-of-denying-request.patch

@@ -1,4 +1,4 @@
-From 6a23d8a1cf2ff7e247dbd4a737b87c792f78e5ab Mon Sep 17 00:00:00 2001
+From 63e531d3545d74d734f56987bbc77256cbcd7763 Mon Sep 17 00:00:00 2001
 From: Greg Hudson <ghudson@mit.edu>
 Date: Thu, 15 Nov 2018 13:40:43 -0500
 Subject: [PATCH] Clear forwardable flag instead of denying request

Fix-config-realm-change-logic-in-FILE-remove_cred.patch

@@ -1,4 +1,4 @@
-From 5215fad65699527aaea73add2cbbbb40de770fa6 Mon Sep 17 00:00:00 2001
+From 4cacf2fa4a181b728742bce8c1ea11c07ba9a143 Mon Sep 17 00:00:00 2001
 From: Greg Hudson <ghudson@mit.edu>
 Date: Tue, 16 Apr 2019 10:47:35 -0400
 Subject: [PATCH] Fix config realm change logic in FILE remove_cred

Fix-memory-leak-in-none-replay-cache-type.patch

@@ -1,4 +1,4 @@
-From 7e3cb737332fad7803205035a90237a9b50e0a36 Mon Sep 17 00:00:00 2001
+From 492872c4581f8b7f6d78cbc2e50e0b819c47a168 Mon Sep 17 00:00:00 2001
 From: Corene Casper <C.Casper@Dell.com>
 Date: Sat, 16 Feb 2019 00:49:26 -0500
 Subject: [PATCH] Fix memory leak in 'none' replay cache type

Fix-potential-close-1-in-cc_file.c.patch

@@ -1,4 +1,4 @@
-From cfe28dcc4a478fa99639b48476316936db87d69e Mon Sep 17 00:00:00 2001
+From 0201f95a60194c99bd3139235eb46e13e7f4484f Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 18 Apr 2019 13:39:37 -0400
 Subject: [PATCH] Fix potential close(-1) in cc_file.c

Fix-some-return-code-handling-bugs.patch

@@ -1,4 +1,4 @@
-From 0bbbeeacc3c8bf22064db4d049e2069a81ab4270 Mon Sep 17 00:00:00 2001
+From e196f175f5b551290efab029295dcf728feb4fac Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 2 May 2019 14:05:38 -0400
 Subject: [PATCH] Fix some return code handling bugs

Implement-krb5_cc_remove_cred-for-remaining-types.patch

@@ -1,4 +1,4 @@
-From 78bfdbba03bbeb3c86c41273a3c3157bfbab7878 Mon Sep 17 00:00:00 2001
+From 6e199a7d007bbfd72ed76ff5534b9b3b88a82227 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Mon, 1 Apr 2019 14:28:48 -0400
 Subject: [PATCH] Implement krb5_cc_remove_cred for remaining types

Improve-error-messages-from-kadmin-change_password.patch

@@ -1,4 +1,4 @@
-From 93717ffc7a5f213e3040e60431df199a5f6e9c76 Mon Sep 17 00:00:00 2001
+From 35681c176f3519df4700fd799ed66efd323f8c66 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Mon, 6 May 2019 13:13:16 -0400
 Subject: [PATCH] Improve error messages from kadmin change_password

In-kpropd-debug-log-proper-ticket-enctype-names.patch

@@ -1,4 +1,4 @@
-From 7483ca4dbac8fedca5bd5ac1ea310e020df0d843 Mon Sep 17 00:00:00 2001
+From 34883789b60e7961ac0c63062ffadbb2e628a76e Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 15 Jan 2019 13:41:16 -0500
 Subject: [PATCH] In kpropd, debug-log proper ticket enctype names

In-rd_req_dec-always-log-non-permitted-enctypes.patch

@@ -1,4 +1,4 @@
-From 9503055f4caad2ab71db488ec434494cc23ce74e Mon Sep 17 00:00:00 2001
+From 4d178af94f1a5f187b43de96ae16b2fb1cf4ba8a Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Mon, 14 Jan 2019 17:14:42 -0500
 Subject: [PATCH] In rd_req_dec, always log non-permitted enctypes

Initialize-some-data-structure-magic-fields.patch

@@ -1,4 +1,4 @@
-From 7973ef9891219a5179592db7081b7ffd6db95103 Mon Sep 17 00:00:00 2001
+From da7349429a2985423ad006cc1f9d149e594118b7 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 2 May 2019 13:36:38 -0400
 Subject: [PATCH] Initialize some data structure magic fields

Make-etype-names-in-KDC-logs-human-readable.patch

@@ -1,4 +1,4 @@
-From 64843356847cc944d246eedd45e34d65c3336e05 Mon Sep 17 00:00:00 2001
+From fddfa2abbc9e1ccd138d66a8c462a6a0eba1ecaa Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 8 Jan 2019 17:42:35 -0500
 Subject: [PATCH] Make etype names in KDC logs human-readable

Mark-deprecated-enctypes-when-used.patch

@@ -1,4 +1,4 @@
-From a3df9ce1ebe05300aaf930d11d53bd354561f044 Mon Sep 17 00:00:00 2001
+From c40eb78a918138369f6d7142590732f563968909 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 10 Jan 2019 16:34:54 -0500
 Subject: [PATCH] Mark deprecated enctypes when used

Modernize-exit-path-in-gss_krb5int_copy_ccache.patch

@@ -1,4 +1,4 @@
-From 50116db1dcf88ad7a5fbe03e5045c6d3059e2bb0 Mon Sep 17 00:00:00 2001
+From bca13182a78bc3c62bd7e616c9b69ce96fe00b98 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 2 May 2019 14:32:33 -0400
 Subject: [PATCH] Modernize exit path in gss_krb5int_copy_ccache()

Properly-size-ifdef-in-k5_cccol_lock.patch

@@ -1,4 +1,4 @@
-From 3e750e184a870a7bc96dac75e2da61ca4414ddd1 Mon Sep 17 00:00:00 2001
+From 5601f9e0291feedeba7a420396d83b38c7332e86 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 14 Feb 2019 11:50:35 -0500
 Subject: [PATCH] Properly size #ifdef in k5_cccol_lock()

Remove-Kerberos-v4-support-vestiges-from-ccapi.patch

@@ -1,4 +1,4 @@
-From 69c1393e9077ecedea84cffc4d2721981aa9205a Mon Sep 17 00:00:00 2001
+From ff88e21470d374f057107148de8b972a04f59641 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 4 Apr 2019 14:37:38 -0400
 Subject: [PATCH] Remove Kerberos v4 support vestiges from ccapi

Remove-ccapi-related-comments-in-configure.ac.patch

@@ -1,4 +1,4 @@
-From fad2355105eaa8ec34cd4c4d3bed05f66d0157ce Mon Sep 17 00:00:00 2001
+From 32b05ffd5f0d6eff5f989a8c30a030a3e1972e5d Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Wed, 3 Apr 2019 16:01:22 -0400
 Subject: [PATCH] Remove ccapi-related comments in configure.ac

Remove-checksum-type-profile-variables.patch

@@ -1,4 +1,4 @@
-From 9d0403155222b7815d5db6063cecd79d530f7e93 Mon Sep 17 00:00:00 2001
+From e3de3f9916acc4ba0ac2e15c2d9a6826802170d2 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Mon, 13 May 2019 14:19:57 -0400
 Subject: [PATCH] Remove checksum type profile variables

Remove-confvalidator-utility.patch

@@ -1,4 +1,4 @@
-From 6d289b110c39c1d617c5e8252cc0bb1d25450b0e Mon Sep 17 00:00:00 2001
+From 2ea1badfb30f8549a5ec00dc8c5f5e58caea5a03 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Wed, 3 Apr 2019 14:58:19 -0400
 Subject: [PATCH] Remove confvalidator utility

Remove-dead-variable-def_kslist-from-two-files.patch

@@ -1,4 +1,4 @@
-From 29262595f5c603276dbeb016b122141839304755 Mon Sep 17 00:00:00 2001
+From a37470b4f45cd40318c8ad84d92f56bdaac4993e Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 2 May 2019 16:57:51 -0400
 Subject: [PATCH] Remove dead variable def_kslist from two files

Remove-doxygen-generated-HTML-output-for-ccapi.patch

@@ -1,4 +1,4 @@
-From 7e85faa6d1df1af351c00a92219e789939d2924c Mon Sep 17 00:00:00 2001
+From 90324f46fe8aed4054ecad4f3a0357ffa3716852 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 4 Apr 2019 14:15:58 -0400
 Subject: [PATCH] Remove doxygen-generated HTML output for ccapi

Remove-kadmin-RPC-support-for-setting-v4-key.patch

@@ -1,4 +1,4 @@
-From 93ee33d4b7ab08c041868a2e43111924c578b5b5 Mon Sep 17 00:00:00 2001
+From 962e49c0ef0faf00210a1f88044782f6fa47a779 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 4 Apr 2019 16:14:46 -0400
 Subject: [PATCH] Remove kadmin RPC support for setting v4 key

Remove-more-dead-code.patch

@@ -1,4 +1,4 @@
-From dbc7e1a5ca3afad7ac6d057266358c6cbe517db5 Mon Sep 17 00:00:00 2001
+From f708c93e82dc34c6ab2bd04be2149bd539faec4d Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Thu, 9 May 2019 14:07:24 -0400
 Subject: [PATCH] Remove more dead code

Remove-ovsec_adm_export-dump-format-support.patch

@@ -1,4 +1,4 @@
-From 17d6296546fc363731e10c986ba19e0d85bd9e0c Mon Sep 17 00:00:00 2001
+From 56be395114bed8e8dd41b91e41e233637488d3ab Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 22 Jan 2019 18:34:58 -0500
 Subject: [PATCH] Remove ovsec_adm_export dump format support

Remove-srvtab-support.patch

@@ -1,4 +1,4 @@
-From aec66c783ddba8b036ea1077bb852832cffcc432 Mon Sep 17 00:00:00 2001
+From 42b1d879cf0705d3bc76c4b546275f1c608ebda9 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Mon, 9 Oct 2017 15:58:33 -0400
 Subject: [PATCH] Remove srvtab support

Simplify-SAM-2-as_key-handling.patch

@@ -1,4 +1,4 @@
-From c63484d9ff8199261e778169474af50883ea11f5 Mon Sep 17 00:00:00 2001
+From 251694f155bd132a162f876e59abf5caf7140c70 Mon Sep 17 00:00:00 2001
 From: Greg Hudson <ghudson@mit.edu>
 Date: Sun, 5 May 2019 18:53:27 -0400
 Subject: [PATCH] Simplify SAM-2 as_key handling

Simply-OpenSSL-PKCS7-decryption-code.patch

@@ -1,4 +1,4 @@
-From bcc55c108502402d2d1f6e4a6ce9a348dd655609 Mon Sep 17 00:00:00 2001
+From 02c3a9756cba8676a3074ae8c1c96b26e1b47c98 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Mon, 6 May 2019 13:13:06 -0400
 Subject: [PATCH] Simply OpenSSL PKCS7 decryption code

Use-secure_getenv-where-appropriate.patch

@@ -1,4 +1,4 @@
-From d7cb05ad91e778c1de0c977b053a22060e6ed579 Mon Sep 17 00:00:00 2001
+From a46c1dd1be09217f9f19e9c70381893dc3995c45 Mon Sep 17 00:00:00 2001
 From: Greg Hudson <ghudson@mit.edu>
 Date: Wed, 24 Apr 2019 16:19:50 -0400
 Subject: [PATCH] Use secure_getenv() where appropriate

krb5-1.11-kpasswdtest.patch

@@ -1,4 +1,4 @@
-From 1da0d2fdbd9cb2ded1913e05664986dce1e1a916 Mon Sep 17 00:00:00 2001
+From d3e720a17e4284c791541840dcbc8652d33a75c4 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 23 Aug 2016 16:52:01 -0400
 Subject: [PATCH] krb5-1.11-kpasswdtest.patch

krb5-1.11-run_user_0.patch

@@ -1,4 +1,4 @@
-From c95d33cc1c66122bc229beb65d36f988fbd05e59 Mon Sep 17 00:00:00 2001
+From 75ba8f42c0e9426af80c71aaaa490cc6262e259c Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 23 Aug 2016 16:49:57 -0400
 Subject: [PATCH] krb5-1.11-run_user_0.patch

krb5-1.12-api.patch

@@ -1,37 +0,0 @@
-From 4ddac573dfc8fea30b5f8750c8c0733c553afcfa Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Tue, 23 Aug 2016 16:47:00 -0400
-Subject: [PATCH] krb5-1.12-api.patch
-
-Reference docs don't define what happens if you call krb5_realm_compare() with
-malformed krb5_principal structures.  Define a behavior which keeps it from
-crashing if applications don't check ahead of time.
----
- src/lib/krb5/krb/princ_comp.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/lib/krb5/krb/princ_comp.c b/src/lib/krb5/krb/princ_comp.c
-index a6936107d..0ed78833b 100644
---- a/src/lib/krb5/krb/princ_comp.c
-+++ b/src/lib/krb5/krb/princ_comp.c
-@@ -36,6 +36,10 @@ realm_compare_flags(krb5_context context,
-     const krb5_data *realm1 = &princ1->realm;
-     const krb5_data *realm2 = &princ2->realm;
- 
-+    if (princ1 == NULL || princ2 == NULL)
-+        return FALSE;
-+    if (realm1 == NULL || realm2 == NULL)
-+        return FALSE;
-     if (realm1->length != realm2->length)
-         return FALSE;
-     if (realm1->length == 0)
-@@ -88,6 +92,9 @@ krb5_principal_compare_flags(krb5_context context,
-     krb5_principal upn2 = NULL;
-     krb5_boolean ret = FALSE;
- 
-+    if (princ1 == NULL || princ2 == NULL)
-+        return FALSE;
-+
-     if (flags & KRB5_PRINCIPAL_COMPARE_ENTERPRISE) {
-         /* Treat UPNs as if they were real principals */
-         if (princ1->type == KRB5_NT_ENTERPRISE_PRINCIPAL) {

krb5-1.13-dirsrv-accountlock.patch

@@ -1,4 +1,4 @@
-From 10f64f13ee3d44a31bcdc124e9ce721bc17b3e00 Mon Sep 17 00:00:00 2001
+From eb26e32b7cce535a7a70168b7f44aa07eb989264 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 23 Aug 2016 16:47:44 -0400
 Subject: [PATCH] krb5-1.13-dirsrv-accountlock.patch

krb5-1.17post2-FIPS-with-PRNG-SPAKE-and-RADIUS.patch

@@ -1,4 +1,4 @@
-From 0c6860f5213e35226670772b53d70c858258a63e Mon Sep 17 00:00:00 2001
+From 853a9aacfbc842037b30607bacb5c60f5918cccb Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Fri, 9 Nov 2018 15:12:21 -0500
 Subject: [PATCH] krb5-1.17post2 FIPS with PRNG, SPAKE, and RADIUS

krb5-1.9-debuginfo.patch

@@ -1,4 +1,4 @@
-From 8ee5efa6aec5d02e25081b6dc809cef668ce45ea Mon Sep 17 00:00:00 2001
+From 454b35ce48bb8de491cad93c8944c783d1c47fd1 Mon Sep 17 00:00:00 2001
 From: Robbie Harwood <rharwood@redhat.com>
 Date: Tue, 23 Aug 2016 16:49:25 -0400
 Subject: [PATCH] krb5-1.9-debuginfo.patch

krb5.spec

@@ -18,7 +18,7 @@ Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.17
 # for prerelease, should be e.g., 0.% {prerelease}.1% { ?dist } (without spaces)
-Release: 21%{?dist}
+Release: 22%{?dist}
 
 # lookaside-cached sources; two downloads and a build artifact
 Source0: https://web.mit.edu/kerberos/dist/krb5/1.17/krb5-%{version}%{prerelease}.tar.gz
@@ -54,7 +54,6 @@ Patch27: krb5-1.17-beta1-selinux-label.patch
 Patch28: krb5-1.12-ksu-path.patch
 Patch30: krb5-1.15-beta1-buildconf.patch
 Patch31: krb5-1.3.1-dns.patch
-Patch32: krb5-1.12-api.patch
 Patch33: krb5-1.13-dirsrv-accountlock.patch
 Patch34: krb5-1.9-debuginfo.patch
 Patch35: krb5-1.11-run_user_0.patch
@@ -704,6 +703,10 @@ exit 0
 %{_libdir}/libkadm5srv_mit.so.*
 
 %changelog
+* Wed May 15 2019 Robbie Harwood <rharwood@redhat.com> - 1.17-22
+- Drop krb5_realm_compare() etc. NULL check patches
+
+
 * Wed May 15 2019 Robbie Harwood <rharwood@redhat.com> - 1.17-21
 - Re-provide krb5-kdb-version in -devel as well (IPA wants it)