|
 |
d738b9 |
From 16c9dd3d2f8d74958495674f4906626a74ef8c12 Mon Sep 17 00:00:00 2001
|
|
|
d738b9 |
From: Robbie Harwood <rharwood@redhat.com>
|
|
|
d738b9 |
Date: Fri, 22 Apr 2016 10:03:07 -0400
|
|
|
d738b9 |
Subject: [PATCH] krb5-kvno-230379.patch
|
|
|
d738b9 |
|
|
|
d738b9 |
---
|
|
|
d738b9 |
src/kadmin/ktutil/ktutil.c | 5 +++--
|
|
|
d738b9 |
src/lib/krb5/keytab/kt_file.c | 2 +-
|
|
|
d738b9 |
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
d738b9 |
|
|
|
d738b9 |
diff --git a/src/kadmin/ktutil/ktutil.c b/src/kadmin/ktutil/ktutil.c
|
|
|
d738b9 |
index ef16d37a5..64a6d6ab1 100644
|
|
|
d738b9 |
--- a/src/kadmin/ktutil/ktutil.c
|
|
|
d738b9 |
+++ b/src/kadmin/ktutil/ktutil.c
|
|
|
d738b9 |
@@ -140,7 +140,7 @@ void ktutil_add_entry(argc, argv)
|
|
|
d738b9 |
char *princ = NULL;
|
|
|
d738b9 |
char *enctype = NULL;
|
|
|
d738b9 |
krb5_kvno kvno = 0;
|
|
|
d738b9 |
- int use_pass = 0, use_key = 0, i;
|
|
|
d738b9 |
+ int use_pass = 0, use_key = 0, use_kvno = 0, i;
|
|
|
d738b9 |
|
|
|
d738b9 |
for (i = 1; i < argc; i++) {
|
|
|
d738b9 |
if ((strlen(argv[i]) == 2) && !strncmp(argv[i], "-p", 2)) {
|
|
|
d738b9 |
@@ -149,6 +149,7 @@ void ktutil_add_entry(argc, argv)
|
|
|
d738b9 |
}
|
|
|
d738b9 |
if ((strlen(argv[i]) == 2) && !strncmp(argv[i], "-k", 2)) {
|
|
|
d738b9 |
kvno = (krb5_kvno) atoi(argv[++i]);
|
|
|
d738b9 |
+ use_kvno++;
|
|
|
d738b9 |
continue;
|
|
|
d738b9 |
}
|
|
|
d738b9 |
if ((strlen(argv[i]) == 2) && !strncmp(argv[i], "-e", 2)) {
|
|
|
d738b9 |
@@ -165,7 +166,7 @@ void ktutil_add_entry(argc, argv)
|
|
|
d738b9 |
}
|
|
|
d738b9 |
}
|
|
|
d738b9 |
|
|
|
d738b9 |
- if (argc != 8 || !(princ && kvno && enctype) || (use_pass+use_key != 1)) {
|
|
|
d738b9 |
+ if (argc != 8 || !(princ && use_kvno && enctype) || (use_pass+use_key != 1)) {
|
|
|
d738b9 |
fprintf(stderr, _("usage: %s (-key | -password) -p principal "
|
|
|
d738b9 |
"-k kvno -e enctype\n"), argv[0]);
|
|
|
d738b9 |
return;
|
|
|
d738b9 |
diff --git a/src/lib/krb5/keytab/kt_file.c b/src/lib/krb5/keytab/kt_file.c
|
|
|
d738b9 |
index 674d88bab..131549ffe 100644
|
|
|
d738b9 |
--- a/src/lib/krb5/keytab/kt_file.c
|
|
|
d738b9 |
+++ b/src/lib/krb5/keytab/kt_file.c
|
|
|
d738b9 |
@@ -377,7 +377,7 @@ krb5_ktfile_get_entry(krb5_context context, krb5_keytab id,
|
|
|
d738b9 |
* Otherwise, remember that we were here so we can return the right
|
|
|
d738b9 |
* error, and free the new.
|
|
|
d738b9 |
*/
|
|
|
d738b9 |
- if (new_entry.vno == kvno) {
|
|
|
d738b9 |
+ if (new_entry.vno == kvno || new_entry.vno == IGNORE_VNO) {
|
|
|
d738b9 |
krb5_kt_free_entry(context, &cur_entry);
|
|
|
d738b9 |
cur_entry = new_entry;
|
|
|
d738b9 |
if (new_entry.vno == kvno)
|