summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNalin Dahyabhai <nalin@dahyabhai.net>2011-05-25 16:55:39 -0400
committerNalin Dahyabhai <nalin@dahyabhai.net>2011-05-25 16:55:39 -0400
commite14f89fa17a84f837dbc20730fb6dce1f208efc0 (patch)
tree0383eaaf6bfb4a1803e8194eb43c77bbad7a604a
parent7368cf9d38dc2a1ec65fdcd6ebf224375df82e66 (diff)
downloadkrb5-e14f89fa17a84f837dbc20730fb6dce1f208efc0.tar.gz
krb5-e14f89fa17a84f837dbc20730fb6dce1f208efc0.tar.xz
krb5-e14f89fa17a84f837dbc20730fb6dce1f208efc0.zip
klist: don't trip over referral entries when invoked with -s (#707145, RT#6915)krb5-1.9.1-2.fc16
-rw-r--r--krb5-klist_s.patch14
-rw-r--r--krb5.spec8
2 files changed, 21 insertions, 1 deletions
diff --git a/krb5-klist_s.patch b/krb5-klist_s.patch
new file mode 100644
index 0000000..3a219ee
--- /dev/null
+++ b/krb5-klist_s.patch
@@ -0,0 +1,14 @@
+Don't trip over referral entries. RT#6915
+
+Index: krb5/src/clients/klist/klist.c
+===================================================================
+--- krb5/src/clients/klist/klist.c (revision 24943)
++++ krb5/src/clients/klist/klist.c (working copy)
+@@ -386,6 +386,7 @@
+ continue;
+ if (status_only) {
+ if (exit_status && creds.server->length == 2 &&
++ creds.server->realm.length > 0 &&
+ strcmp(creds.server->realm.data, princ->realm.data) == 0 &&
+ strcmp((char *)creds.server->data[0].data, "krbtgt") == 0 &&
+ strcmp((char *)creds.server->data[1].data,
diff --git a/krb5.spec b/krb5.spec
index 0c91a77..dd1e99c 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -6,7 +6,7 @@
Summary: The Kerberos network authentication system
Name: krb5
Version: 1.9.1
-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.9/krb5-1.9.1-signed.tar
Source0: krb5-%{version}.tar.gz
@@ -52,6 +52,7 @@ Patch72: krb5-pkinit-cms2.patch
Patch75: krb5-pkinit-debug.patch
Patch77: krb5-1.9-paren.patch
Patch78: krb5-trunk-chpw-err.patch
+Patch79: krb5-klist_s.patch
License: MIT
URL: http://web.mit.edu/kerberos/www/
@@ -195,6 +196,7 @@ ln -s NOTICE LICENSE
#%patch75 -p1 -b .pkinit-debug
%patch77 -p1 -b .paren
%patch78 -p0 -b .chpw-err
+%patch79 -p1 -b .klist_s
gzip doc/*.ps
sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex
@@ -653,6 +655,10 @@ exit 0
%{_sbindir}/uuserver
%changelog
+* Wed May 25 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-2
+- klist: don't trip over referral entries when invoked with -s (#707145,
+ RT#6915)
+
* Fri May 6 2011 Nalin Dahyabhai <nalin@redhat.com>
- fixup URL in a comment
- when built with NSS, require 3.12.10 rather than 3.12.9