Support config snippets in /etc/krb5.conf.d/ and /usr/share/krb5.conf.d/

Resolves: rhbz#1225792, rhbz#1146370, rhbz#1145808
This commit is contained in:
Robbie Harwood (frozencemetery) 2015-09-10 19:37:58 +00:00
parent 580aefb618
commit 6cb6b69409
2 changed files with 13 additions and 0 deletions

View File

@ -1,3 +1,6 @@
includedir /etc/krb5.conf.d/
includedir /usr/share/krb5.conf.d/
[logging]
default = FILE:/var/log/krb5libs.log
kdc = FILE:/var/log/krb5kdc.log

View File

@ -490,6 +490,10 @@ 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 these directores.
mkdir -p $RPM_BUILD_ROOT/etc/krb5.conf.d
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
@ -891,6 +895,8 @@ exit 0
# These are hard-coded, not-dependent-on-the-configure-script paths.
%dir /etc/gss
%dir /etc/gss/mech.d
%dir /etc/krb5.conf.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*
@ -987,6 +993,10 @@ exit 0
%changelog
* Thu Sep 10 2015 Robbie Harwood <rharwood@redhat.com> - 1.13.2-7
- Support config snippets in /etc/krb5.conf.d/ and /usr/share/krb5.conf.d/
(#1225792, #1146370, #1145808)
* Thu Jun 25 2015 Roland Mainz <rmainz@redhat.com> - 1.13.2-6
- Use system nss_wrapper and socket_wrapper for testing.
Patch by Andreas Schneider <asn@redhat.com>