summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobbie Harwood (frozencemetery) <rharwood@redhat.com>2015-09-23 15:11:53 +0000
committerRobbie Harwood (frozencemetery) <rharwood@redhat.com>2015-09-23 15:11:53 +0000
commita9af3c8817d73f522efaffa7f3ab7efbbce0c0ee (patch)
tree8ff4df1c4ba46601ad2710a2a8659b51e1c9de07
parent65ce267be1061e6349bb5f566b7abef0c48d7492 (diff)
downloadkrb5-a9af3c8817d73f522efaffa7f3ab7efbbce0c0ee.tar.gz
krb5-a9af3c8817d73f522efaffa7f3ab7efbbce0c0ee.tar.xz
krb5-a9af3c8817d73f522efaffa7f3ab7efbbce0c0ee.zip
Nix /usr/share/krb5.conf.d to reduce complexity
-rw-r--r--krb5.conf1
-rw-r--r--krb5.spec9
2 files changed, 4 insertions, 6 deletions
diff --git a/krb5.conf b/krb5.conf
index 864a487..a255d02 100644
--- a/krb5.conf
+++ b/krb5.conf
@@ -1,5 +1,4 @@
includedir /etc/krb5.conf.d/
-includedir /usr/share/krb5.conf.d/
[logging]
default = FILE:/var/log/krb5libs.log
diff --git a/krb5.spec b/krb5.spec
index b0d37f5..3aaa781 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -43,7 +43,7 @@
Summary: The Kerberos network authentication system
Name: krb5
Version: 1.13.2
-Release: 9%{?dist}
+Release: 10%{?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
@@ -491,9 +491,6 @@ mkdir -p $RPM_BUILD_ROOT%{_var}/kerberos/krb5/user
mkdir -p $RPM_BUILD_ROOT/etc
install -pm 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/krb5.conf
-# krb5.conf has default include on this directory.
-mkdir -p $RPM_BUILD_ROOT/usr/share/krb5.conf.d
-
# Parent of configuration file for list of loadable GSS mechs ("mechs"). This
# location is not relative to sysconfdir, but is hard-coded in g_initialize.c.
mkdir -m 755 -p $RPM_BUILD_ROOT/etc/gss
@@ -881,7 +878,6 @@ exit 0
# These are hard-coded, not-dependent-on-the-configure-script paths.
%dir /etc/gss
%dir /etc/gss/mech.d
-%dir /usr/share/krb5.conf.d
%verify(not md5 size mtime) %config(noreplace) /etc/krb5.conf
/%{_mandir}/man5/.k5identity.5*
/%{_mandir}/man5/.k5login.5*
@@ -978,6 +974,9 @@ exit 0
%changelog
+* Wed Sep 23 2015 Robbie Harwood <rharwood@redhat.com> - 1.13.2-10
+- Nix /usr/share/krb5.conf.d to reduce complexity
+
* Wed Sep 23 2015 Robbie Harwood <rharwood@redhat.com> - 1.13.2-9
- Depend on crypto-policies which provides /etc/krb5.conf.d (#1225792)