switch to the upstream patch for #707145

This commit is contained in:
Nalin Dahyabhai 2011-05-26 10:55:11 -04:00
parent e14f89fa17
commit 20266fd9d7
2 changed files with 26 additions and 8 deletions

View File

@ -2,13 +2,28 @@ 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 @@
--- krb5/src/clients/klist/klist.c
+++ krb5/src/clients/klist/klist.c
@@ -24,7 +24,7 @@
* List out the contents of your credential cache or keytab.
*/
-#include "autoconf.h"
+#include "k5-int.h"
#include <krb5.h>
#include <com_err.h>
#include <stdlib.h>
@@ -386,10 +386,9 @@
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,
- 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,
- princ->realm.data) == 0 &&
+ data_eq(creds.server->realm, princ->realm) &&
+ data_eq_string(creds.server->data[0], "krbtgt") &&
+ data_eq(creds.server->data[1], princ->realm) &&
creds.times.endtime > now)
exit_status = 0;
} else {

View File

@ -6,7 +6,7 @@
Summary: The Kerberos network authentication system
Name: krb5
Version: 1.9.1
Release: 2%{?dist}
Release: 3%{?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
@ -655,6 +655,9 @@ exit 0
%{_sbindir}/uuserver
%changelog
* Thu May 26 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-3
- switch to the upstream patch for #707145
* 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)