[krb5/f14] - switch to the upstream patch for #707145

[Nalin Dahyabhai]

commit 1d753aa57fd1b51b68e5276bcb588a27853a00e2
Author: Nalin Dahyabhai <nalin at dahyabhai.net>
Date:   Fri Jun 24 13:44:50 2011 -0400

    - switch to the upstream patch for #707145

 krb5-klist_s.patch |   29 ++++++++++++++++++++++-------
 krb5.spec          |    1 +
 2 files changed, 23 insertions(+), 7 deletions(-)
---
diff --git a/krb5-klist_s.patch b/krb5-klist_s.patch
index 3a219ee..3e96ed6 100644
--- a/krb5-klist_s.patch
+++ b/krb5-klist_s.patch
@@ -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 {
diff --git a/krb5.spec b/krb5.spec
index 3b23fde..9f6d4da 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -642,6 +642,7 @@ exit 0
 * Fri Jun 24 2011 Nalin Dahyabhai <nalin at redhat.com>
 - incorporate a fix to teach the file labeling patch about when replay caches
   are expunged (#576093)
+- switch to the upstream patch for #707145
 
 * Thu Jun 23 2011 Nalin Dahyabhai <nalin at redhat.com>
 - drop not-needed-since-1.8 build dependency on rsh (ssorce)