From: Ken Raeburn <raeburn@mit.edu>
Date: Thu, 29 Jan 2009 23:47:47 +0000 (+0000)
Subject: When listing master key versions, if none of them appears to be active
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77f793bbeea63ef6769331ac3ee03a2332a3615f;p=thirdparty%2Fkrb5.git

When listing master key versions, if none of them appears to be active
(can currently happen in certain time-warp cases), print a message to
that effect and keep going with the listing.

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/mkey_migrate@21834 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/kadmin/dbutil/kdb5_mkey.c b/src/kadmin/dbutil/kdb5_mkey.c
index 18667feae5..1be680005b 100644
--- a/src/kadmin/dbutil/kdb5_mkey.c
+++ b/src/kadmin/dbutil/kdb5_mkey.c
@@ -467,7 +467,8 @@ kdb5_use_mkey(int argc, char *argv[])
 
     retval = krb5_dbe_lookup_actkvno(util_context, &master_entry, &actkvno_list);
     if (retval != 0) {
-        com_err(progname, retval, "while setting up master key name");
+        com_err(progname, retval,
+                "while looking up active version of master key");
         exit_status++;
         return;
     }
@@ -628,8 +629,14 @@ kdb5_list_mkeys(int argc, char *argv[])
     } else {
         retval = krb5_dbe_find_act_mkey(util_context, master_keylist,
                                         actkvno_list, &act_kvno, &act_mkey);
-        if (retval != 0) {
-            com_err(progname, retval, "while setting up master key name");
+        if (retval == KRB5_KDB_NOACTMASTERKEY) {
+            /* Maybe we went through a time warp, and the only keys
+               with activation dates have them set in the future?  */
+            com_err(progname, retval, "");
+            /* Keep going.  */
+            act_kvno = -1;
+        } else if (retval != 0) {
+            com_err(progname, retval, "while looking up active master key");
             exit_status++;
             return;
         }