From 2674e01b2786ac7193da2d90bbd4b9b3658aa310 Mon Sep 17 00:00:00 2001 From: Robbie Harwood Date: Wed, 16 Aug 2017 20:07:07 +0000 Subject: * Mon Aug 07 2017 Robbie Harwood 1.15.1-21 Display an error message if ocsp pkinit is requested --- krb5.conf | 1 - krb5.spec | 11 ++++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/krb5.conf b/krb5.conf index a588211..cf23f53 100644 --- a/krb5.conf +++ b/krb5.conf @@ -8,7 +8,6 @@ includedir /etc/krb5.conf.d/ admin_server = FILE:/var/log/kadmind.log [libdefaults] - dns_canonicalize_hostname = false dns_lookup_realm = false ticket_lifetime = 24h renew_lifetime = 7d diff --git a/krb5.spec b/krb5.spec index 91e1088..5b184a7 100644 --- a/krb5.spec +++ b/krb5.spec @@ -18,7 +18,7 @@ Summary: The Kerberos network authentication system Name: krb5 Version: 1.15.1 # for prerelease, should be e.g., 0.3.beta2%{?dist} -Release: 21%{?dist} +Release: 22%{?dist} # - Maybe we should explode from the now-available-to-everybody tarball instead? # http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.2-signed.tar # - The sources below are stored in a lookaside cache. Upload with @@ -521,12 +521,7 @@ rm -- "$RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/preauth/test.so" %post libs -p /sbin/ldconfig -%triggerun libs -- krb5-libs < 1.15.1-20 -if ! grep -q 'dns_canonicalize_hostname' /etc/krb5.conf ; then - sed -i 's/\[libdefaults\]/\[libdefaults\]\n dns_canonicalize_hostname = false/' /etc/krb5.conf -fi - -# Correct trigger would be krb5-libs < 1.15.1-5 +%triggerun libs -- krb5-libs < 1.15.1-5 if ! grep -q 'includedir /etc/krb5.conf.d' /etc/krb5.conf ; then sed -i '1i # To opt out of the system crypto-policies configuration of krb5, remove the\n# symlink at /etc/krb5.conf.d/crypto-policies which will not be recreated.\nincludedir /etc/krb5.conf.d/\n' /etc/krb5.conf fi @@ -737,6 +732,8 @@ exit 0 %{_libdir}/libkadm5srv_mit.so.* %changelog +* Wed Aug 16 2017 Robbie Harwood - 1.15.1-22 + * Mon Aug 07 2017 Robbie Harwood - 1.15.1-21 - Display an error message if ocsp pkinit is requested -- cgit