From f15271f04d938b5a0b71e0d7c1e967bcf8baa621 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Wed, 8 Jul 2020 20:10:01 +0000
Subject: [PATCH] Set qualify_shortname empty in default configuration

Resolves: #1852041
---
 krb5.conf | 1 +
 krb5.spec | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/krb5.conf b/krb5.conf
index 4f0d898..5e474d1 100644
--- a/krb5.conf
+++ b/krb5.conf
@@ -16,6 +16,7 @@ includedir /etc/krb5.conf.d/
     pkinit_anchors = FILE:/etc/pki/tls/certs/ca-bundle.crt
     spake_preauth_groups = edwards25519
     dns_canonicalize_hostname = fallback
+    qualify_shortname = ""
 #    default_realm = EXAMPLE.COM
 
 [realms]
diff --git a/krb5.spec b/krb5.spec
index b3e9dfa..18792f8 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -18,7 +18,7 @@ Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.18.2
 # for prerelease, should be e.g., 0.% {prerelease}.1% { ?dist } (without spaces)
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 # rharwood has trust path to signing key and verifies on check-in
 Source0: https://web.mit.edu/kerberos/dist/krb5/1.18/krb5-%{version}%{prerelease}.tar.gz
@@ -622,6 +622,10 @@ exit 0
 %{_libdir}/libkadm5srv_mit.so.*
 
 %changelog
+* Wed Jul 08 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.2-10
+- Set qualify_shortname empty in default configuration
+- Resolves: #1852041
+
 * Mon Jun 15 2020 Robbie Harwood <rharwood@redhat.com> - 1.18.2-9
 - Use two queues for concurrent t_otp.py daemons