From 32cf59a499a04d8ff81e2e18aad1e478c538fe9b Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: Oct 25 2016 17:31:31 +0000
Subject: Remove krb5 config files, and only enable autodiscovery for RHEL6


This reverts commit 7007fa293c6b9e2c225745d6591ee318f8d46936.

Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>

---

diff --git a/Makefile.am b/Makefile.am
index 0ed368e..971b825 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -78,9 +78,3 @@ kojiconf_DATA = $(srcdir)/configs/arm-config \
 	$(srcdir)/configs/s390-config \
 	$(srcdir)/configs/stg-config
 kojiconfdir = $(sysconfdir)/koji
-
-EXTRA_DIST += krb-configs/fedoraproject_org \
-	krb-configs/stg_fedoraproject_org
-krb5conf_DATA = $(srcdir)/krb-configs/fedoraproject_org \
-	$(srcdir)/krb-configs/stg_fedoraproject_org
-krb5confdir = $(sysconfdir)/krb5.conf.d
diff --git a/fedora-packager.spec b/fedora-packager.spec
index 825de7e..b0aab78 100644
--- a/fedora-packager.spec
+++ b/fedora-packager.spec
@@ -4,7 +4,7 @@
 
 Name:           fedora-packager
 Version:        0.5.10.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tools for setting up a fedora maintainer environment
 
 Group:          Applications/Productivity
@@ -22,8 +22,7 @@ Requires:       redhat-rpm-config
 Requires:       fedpkg >= 1.0
 Requires:       fedora-cert = %{version}-%{release}
 Requires:       python-yubico
-# This is the version in which SNI was fixed
-Requires:       krb5-workstation >= 1.14.3-4
+Requires:       krb5-workstation
 
 BuildArch:      noarch
 
@@ -58,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libexecdir}
 
+%post
+sed -i -e 's/dns_lookup_kdc = false/dns_lookup_kdc = true/' /etc/krb5.conf
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,7 +72,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/*
 %dir %{_sysconfdir}/koji
 %config(noreplace) %{_sysconfdir}/koji/*
-%config %{_sysconfdir}/krb5.conf.d/*
 %exclude %{_bindir}/fedora-cert
 
 %files -n fedora-cert
@@ -81,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 25 2016 Patrick Uiterwijk <puiterwijk@redhat.com> - 0.5.10.7-2
+- Use autodiscovery for krb
+
 * Wed Aug 10 2016 Patrick Uiterwijk <puiterwijk@redhat.com> - 0.5.10.7-1
 - Add kerberos configuration
 
diff --git a/krb-configs/fedoraproject_org b/krb-configs/fedoraproject_org
deleted file mode 100644
index 4f1342d..0000000
--- a/krb-configs/fedoraproject_org
+++ /dev/null
@@ -1,7 +0,0 @@
-[realms]
- FEDORAPROJECT.ORG = {
-        kdc = https://id.fedoraproject.org/KdcProxy
- }
-[domain_realm]
- .fedoraproject.org = FEDORAPROJECT.ORG
- fedoraproject.org = FEDORAPROJECT.ORG
diff --git a/krb-configs/stg_fedoraproject_org b/krb-configs/stg_fedoraproject_org
deleted file mode 100644
index 1d7b132..0000000
--- a/krb-configs/stg_fedoraproject_org
+++ /dev/null
@@ -1,7 +0,0 @@
-[realms]
- STG.FEDORAPROJECT.ORG = {
-        kdc = https://id.stg.fedoraproject.org/KdcProxy
- }
-[domain_realm]
- .stg.fedoraproject.org = STG.FEDORAPROJECT.ORG
- stg.fedoraproject.org = STG.FEDORAPROJECT.ORG