rpms/krb5
7
0
Fork 0
Code Issues Pull Requests Releases Activity

correct some configuration file paths

Browse Source 
Correct some configuration file paths which the KDC_DIR patch
inadvertently changed.
This commit is contained in:
Nalin Dahyabhai 2013-04-17 10:42:46 -04:00
parent 3ba00c4edc
commit d54b8d87c6
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
krb5-kdcdir2.patch Normal file
View File

@ -0,0 +1,17 @@
Remove an extra "/krb5kdc" from any paths under KDC_DIR, which already
includes that component.
--- krb5/src/include/osconf.hin
+++ krb5/src/include/osconf.hin
@@ -63,10 +63,10 @@
#define DEFAULT_KEYFILE_STUB KDC_DIR "/.k5."
#define KRB5_DEFAULT_ADMIN_ACL KDC_DIR "/krb5_adm.acl"
/* Used by old admin server */
-#define DEFAULT_ADMIN_ACL KDC_DIR "/krb5kdc/kadm_old.acl"
+#define DEFAULT_ADMIN_ACL KDC_DIR "/kadm_old.acl"
/* Location of KDC profile */
-#define DEFAULT_KDC_PROFILE KDC_DIR "/krb5kdc/kdc.conf"
+#define DEFAULT_KDC_PROFILE KDC_DIR "/kdc.conf"
#define KDC_PROFILE_ENV "KRB5_KDC_PROFILE"
#if TARGET_OS_MAC

7
krb5.spec
View File

@ -30,7 +30,7 @@
Summary: The Kerberos network authentication system Summary: The Kerberos network authentication system
Name: krb5 Name: krb5
Version: 1.11.2 Version: 1.11.2
Release: 1%{?dist} Release: 2%{?dist}
# Maybe we should explode from the now-available-to-everybody tarball instead? # Maybe we should explode from the now-available-to-everybody tarball instead?
# http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.2-signed.tar # http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.2-signed.tar
Source0: krb5-%{version}.tar.gz Source0: krb5-%{version}.tar.gz
@ -83,6 +83,7 @@ Patch201: 0001-add-k5memdup.patch
Patch202: 0002-add-libkrad.patch Patch202: 0002-add-libkrad.patch
Patch203: 0003-Add-internal-KDC_DIR-macro.patch Patch203: 0003-Add-internal-KDC_DIR-macro.patch
Patch204: 0004-add-otp-plugin.patch Patch204: 0004-add-otp-plugin.patch
Patch205: krb5-kdcdir2.patch
License: MIT License: MIT
URL: http://web.mit.edu/kerberos/www/ URL: http://web.mit.edu/kerberos/www/
@ -303,6 +304,7 @@ ln -s NOTICE LICENSE
%patch202 -p1 -b .add-libkrad %patch202 -p1 -b .add-libkrad
%patch203 -p1 -b .add-internal-kdc_dir %patch203 -p1 -b .add-internal-kdc_dir
%patch204 -p1 -b .add-otp-plugin %patch204 -p1 -b .add-otp-plugin
%patch205 -p1 -b .kdcdir2
# Take the execute bit off of documentation. # Take the execute bit off of documentation.
chmod -x doc/krb5-protocol/*.txt chmod -x doc/krb5-protocol/*.txt
@ -825,6 +827,9 @@ exit 0
%{_sbindir}/uuserver %{_sbindir}/uuserver
%changelog %changelog
* Wed Apr 17 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.2-2
- correct some configuration file paths which the KDC_DIR patch missed
* Mon Apr 15 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.2-1 * Mon Apr 15 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.2-1
- update to 1.11.2 - update to 1.11.2
- drop pulled in patch for RT#7586, included in this release - drop pulled in patch for RT#7586, included in this release