From eb1f8e54b9be5baea2999b96bed043b011665c86 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: Fri, 5 Nov 2010 15:09:31 -0400
Subject: [PATCH] - fix included in 1.9

---
 krb5-1.8.x-authdata.patch | 34 ----------------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 krb5-1.8.x-authdata.patch

diff --git a/krb5-1.8.x-authdata.patch b/krb5-1.8.x-authdata.patch
deleted file mode 100644
index a5bce28..0000000
--- a/krb5-1.8.x-authdata.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Candidate fix for CVE-2010-1322.
-
-diff -up krb5/src/kdc/kdc_authdata.c krb5/src/kdc/kdc_authdata.c
---- krb5/src/kdc/kdc_authdata.c	2010-09-22 16:01:55.196827943 -0400
-+++ krb5/src/kdc/kdc_authdata.c	2010-09-22 16:01:58.282828001 -0400
-@@ -495,7 +495,7 @@ merge_authdata (krb5_context context,
-                 krb5_boolean copy,
-                 krb5_boolean ignore_kdc_issued)
- {
--    size_t i, nadata = 0;
-+    size_t i, j, nadata = 0;
-     krb5_authdata **authdata = *out_authdata;
- 
-     if (in_authdata == NULL || in_authdata[0] == NULL)
-@@ -529,16 +529,16 @@ merge_authdata (krb5_context context,
-         in_authdata = tmp;
-     }
- 
--    for (i = 0; in_authdata[i] != NULL; i++) {
-+    for (i = 0, j = 0; in_authdata[i] != NULL; i++) {
-         if (ignore_kdc_issued &&
-             is_kdc_issued_authdatum(context, in_authdata[i], 0)) {
-             free(in_authdata[i]->contents);
-             free(in_authdata[i]);
-         } else
--            authdata[nadata + i] = in_authdata[i];
-+            authdata[nadata + j++] = in_authdata[i];
-     }
- 
--    authdata[nadata + i] = NULL;
-+    authdata[nadata + j] = NULL;
- 
-     free(in_authdata);
-