From 89512499b626e584ad71307b9dec6d57fc2c5ebc52714b2f846815ec253cc74e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Sun, 10 Jan 2016 16:46:56 +0000
Subject: [PATCH] -

OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=155
---
 krb5-kvno-230379.patch | 53 ------------------------------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 krb5-kvno-230379.patch

diff --git a/krb5-kvno-230379.patch b/krb5-kvno-230379.patch
deleted file mode 100644
index d3dbceb..0000000
--- a/krb5-kvno-230379.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From patch attached to http://krbdev.mit.edu/rt/Ticket/Display.html?id=3349,
-at http://krbdev.mit.edu/rt/Ticket/Attachment/23851/13214/kvno.diff, adjusted
-as needed to apply to 1.10.  FIXME: I'd like to better handle cases where we
-have a new key with the right version stored later in the keytab file.
-Currently, we're setting up to overlook that possibility.
-
-Note that this only affects the path taken when krb5_rd_rep() is passed a
-server principal name, as without a server principal name it already tries
-all of the keys it finds in the keytab, regardless of version numbers.
-
-Index: krb5-1.11.1/src/kadmin/ktutil/ktutil.c
-===================================================================
---- krb5-1.11.1.orig/src/kadmin/ktutil/ktutil.c
-+++ krb5-1.11.1/src/kadmin/ktutil/ktutil.c
-@@ -155,7 +155,7 @@ void ktutil_add_entry(argc, argv)
-     char *princ = NULL;
-     char *enctype = NULL;
-     krb5_kvno kvno = 0;
--    int use_pass = 0, use_key = 0, i;
-+    int use_pass = 0, use_key = 0, use_kvno = 0, i;
- 
-     for (i = 1; i < argc; i++) {
-         if ((strlen(argv[i]) == 2) && !strncmp(argv[i], "-p", 2)) {
-@@ -164,6 +164,7 @@ void ktutil_add_entry(argc, argv)
-         }
-         if ((strlen(argv[i]) == 2) && !strncmp(argv[i], "-k", 2)) {
-             kvno = (krb5_kvno) atoi(argv[++i]);
-+            use_kvno++;
-             continue;
-         }
-         if ((strlen(argv[i]) == 2) && !strncmp(argv[i], "-e", 2)) {
-@@ -180,7 +181,7 @@ void ktutil_add_entry(argc, argv)
-         }
-     }
- 
--    if (argc != 8 || !(princ && kvno && enctype) || (use_pass+use_key != 1)) {
-+    if (argc != 8 || !(princ && use_kvno && enctype) || (use_pass+use_key != 1)) {
-         fprintf(stderr, _("usage: %s (-key | -password) -p principal "
-                           "-k kvno -e enctype\n"), argv[0]);
-         return;
-Index: krb5-1.11.1/src/lib/krb5/keytab/kt_file.c
-===================================================================
---- krb5-1.11.1.orig/src/lib/krb5/keytab/kt_file.c
-+++ krb5-1.11.1/src/lib/krb5/keytab/kt_file.c
-@@ -349,7 +349,7 @@ krb5_ktfile_get_entry(krb5_context conte
-                higher than that.  Short-term workaround: only compare
-                the low 8 bits.  */
- 
--            if (new_entry.vno == (kvno & 0xff)) {
-+            if (new_entry.vno == (kvno & 0xff) || new_entry.vno == IGNORE_VNO) {
-                 krb5_kt_free_entry(context, &cur_entry);
-                 cur_entry = new_entry;
-                 break;