Make sure nentries == 1 after calling krb5_db_get_principal() in

kdb5_mkey.c.

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

diff --git a/src/kadmin/dbutil/kdb5_mkey.c b/src/kadmin/dbutil/kdb5_mkey.c
index 0c0daec546ee3f601b38530f9dddcc1ec1abeb70..4eab100c358b0636fe37da386f25233193faf96e 100644 (file)
--- a/src/kadmin/dbutil/kdb5_mkey.c
+++ b/src/kadmin/dbutil/kdb5_mkey.c
@@ -215,8 +215,8 @@ kdb5_add_mkey(int argc, char *argv[])
 
     retval = krb5_db_get_principal(util_context, master_princ, &master_entry,
                                    &nentries, &more);
-    if (retval != 0) {
-        com_err(progname, retval, "while setting up master key name");
+    if (retval != 0 || nentries != 1) {
+        com_err(progname, retval, "while getting master key principal %s", mkey_fullname);
         exit_status++;
         return;
     }
@@ -389,10 +389,10 @@ kdb5_use_mkey(int argc, char *argv[])
         return;
     }
 
-    retval = krb5_db_get_principal(util_context, master_princ, &master_entry, &nentries,
-        &more);
-    if (retval != 0) {
-        com_err(progname, retval, "while setting up master key name");
+    retval = krb5_db_get_principal(util_context, master_princ, &master_entry,
+                                   &nentries, &more);
+    if (retval != 0 || nentries != 1) {
+        com_err(progname, retval, "while getting master key principal %s", mkey_fullname);
         exit_status++;
         return;
     }
@@ -522,9 +522,9 @@ kdb5_list_mkeys(int argc, char *argv[])
         return;
     }
 
-    retval = krb5_db_get_principal(util_context, master_princ, &master_entry, &nentries,
-        &more);
-    if (retval != 0) {
+    retval = krb5_db_get_principal(util_context, master_princ, &master_entry,
+                                   &nentries, &more);
+    if (retval != 0 || nentries != 1) {
         com_err(progname, retval, "while getting master key principal %s", mkey_fullname);
         exit_status++;
         return;