summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNalin Dahyabhai <nalin@fedoraproject.org>2006-02-06 20:04:44 +0000
committerNalin Dahyabhai <nalin@fedoraproject.org>2006-02-06 20:04:44 +0000
commit2118c17c6b685e9c61ccc3114c490bb834ccdb32 (patch)
treeb4501b879423cdc5d005193d4b52a451231ba911
parent5bf2d7bd12579781f6e471f26d00c492a1552e55 (diff)
downloadkrb5-2118c17c6b685e9c61ccc3114c490bb834ccdb32.tar.gz
krb5-2118c17c6b685e9c61ccc3114c490bb834ccdb32.tar.xz
krb5-2118c17c6b685e9c61ccc3114c490bb834ccdb32.zip
- give a little bit more information to the user when kinit gets thekrb5-1_4_3-4
catch-all I/O error (#180175)
-rw-r--r--krb5-1.4.3-enospc.patch30
-rw-r--r--krb5.spec8
2 files changed, 37 insertions, 1 deletions
diff --git a/krb5-1.4.3-enospc.patch b/krb5-1.4.3-enospc.patch
new file mode 100644
index 0000000..c5fcae9
--- /dev/null
+++ b/krb5-1.4.3-enospc.patch
@@ -0,0 +1,30 @@
+If the error message is going to be ambiguous, try to give the user some clue
+by returning the last error reported by the OS.
+
+--- krb5-1.4.3/src/clients/kinit/kinit.c 2006-02-06 13:50:06.000000000 -0500
++++ krb5-1.4.3/src/clients/kinit/kinit.c 2006-02-06 13:49:41.000000000 -0500
+@@ -34,6 +34,7 @@
+ #else
+ #undef HAVE_KRB524
+ #endif
++#include <errno.h>
+ #include <string.h>
+ #include <stdio.h>
+ #include <time.h>
+@@ -846,8 +847,14 @@
+
+ code = krb5_cc_initialize(k5->ctx, k5->cc, k5->me);
+ if (code) {
+- com_err(progname, code, "when initializing cache %s",
+- opts->k5_cache_name?opts->k5_cache_name:"");
++ if ((code == KRB5_CC_IO) && (errno != 0)) {
++ com_err(progname, code, "when initializing cache %s: %s",
++ opts->k5_cache_name?opts->k5_cache_name:"",
++ strerror(errno));
++ } else {
++ com_err(progname, code, "when initializing cache %s",
++ opts->k5_cache_name?opts->k5_cache_name:"");
++ }
+ goto cleanup;
+ }
+
diff --git a/krb5.spec b/krb5.spec
index 10774ed..8b68d37 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -10,7 +10,7 @@
Summary: The Kerberos network authentication system.
Name: krb5
Version: 1.4.3
-Release: 3
+Release: 4
# Maybe we should explode from the now-available-to-everybody tarball instead?
# http://web.mit.edu/kerberos/dist/krb5/1.4/krb5-1.4.3-signed.tar
Source0: krb5-%{version}.tar.gz
@@ -73,6 +73,7 @@ Patch40: krb5-1.4.1-telnet-environ.patch
Patch41: krb5-1.2.7-login-lpass.patch
Patch42: krb5-1.4.3-pthread_np.patch
Patch43: krb5-1.4.3-kdc_max_dgram_size.patch
+Patch44: krb5-1.4.3-enospc.patch
License: MIT, freely distributable.
URL: http://web.mit.edu/kerberos/www/
Group: System Environment/Libraries
@@ -137,6 +138,10 @@ network uses Kerberos, this package should be installed on every
workstation.
%changelog
+* Mon Feb 6 2006 Nalin Dahyabhai <nalin@redhat.com> 1.4.3-4
+- give a little bit more information to the user when kinit gets the catch-all
+ I/O error (#180175)
+
* Thu Jan 19 2006 Nalin Dahyabhai <nalin@redhat.com> 1.4.3-3
- rebuild properly when pthread_mutexattr_setrobust_np() is defined but not
declared, such as with recent glibc when _GNU_SOURCE isn't being used
@@ -901,6 +906,7 @@ workstation.
%patch42 -p1 -b .pthread_np
# Don't apply this until we hear back from upstream.
#%patch43 -p1 -b .kdc_max_dgram_size
+%patch44 -p1 -b .enospc
cp src/krb524/README README.krb524
find . -type f -name "*.info-dir" -exec rm -fv "{}" ";"
gzip doc/*.ps