diff options
| author | Nalin Dahyabhai <nalin@dahyabhai.net> | 2013-04-17 10:42:46 -0400 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@dahyabhai.net> | 2013-04-17 10:42:46 -0400 |
| commit | d54b8d87c6351a2e97031778d98a0ea3d9f40a6d (patch) | |
| tree | 28b44059b989c6eeb4105680f625c883bf19a879 | |
| parent | 3ba00c4edc56d2e6e272364d0311ffb3b9b7fa6e (diff) | |
| download | krb5-d54b8d87c6351a2e97031778d98a0ea3d9f40a6d.tar.gz krb5-d54b8d87c6351a2e97031778d98a0ea3d9f40a6d.tar.xz krb5-d54b8d87c6351a2e97031778d98a0ea3d9f40a6d.zip | |
correct some configuration file pathskrb5-1.11.2-2.fc20krb5-1.11.2-2.fc19
Correct some configuration file paths which the KDC_DIR patch
inadvertently changed.
| -rw-r--r-- | krb5-kdcdir2.patch | 17 | ||||
| -rw-r--r-- | krb5.spec | 7 |
2 files changed, 23 insertions, 1 deletions
diff --git a/krb5-kdcdir2.patch b/krb5-kdcdir2.patch new file mode 100644 index 0000000..57aefe4 --- /dev/null +++ b/krb5-kdcdir2.patch @@ -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 @@ -30,7 +30,7 @@ Summary: The Kerberos network authentication system Name: krb5 Version: 1.11.2 -Release: 1%{?dist} +Release: 2%{?dist} # 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 Source0: krb5-%{version}.tar.gz @@ -83,6 +83,7 @@ Patch201: 0001-add-k5memdup.patch Patch202: 0002-add-libkrad.patch Patch203: 0003-Add-internal-KDC_DIR-macro.patch Patch204: 0004-add-otp-plugin.patch +Patch205: krb5-kdcdir2.patch License: MIT URL: http://web.mit.edu/kerberos/www/ @@ -303,6 +304,7 @@ ln -s NOTICE LICENSE %patch202 -p1 -b .add-libkrad %patch203 -p1 -b .add-internal-kdc_dir %patch204 -p1 -b .add-otp-plugin +%patch205 -p1 -b .kdcdir2 # Take the execute bit off of documentation. chmod -x doc/krb5-protocol/*.txt @@ -825,6 +827,9 @@ exit 0 %{_sbindir}/uuserver %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 - update to 1.11.2 - drop pulled in patch for RT#7586, included in this release |