From: Will Fiveash <will.fiveash@oracle.com>
Date: Wed, 28 Jan 2009 02:18:28 +0000 (+0000)
Subject: Make sure nentries == 1 after calling krb5_db_get_principal() in
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=925c342c94fdd75dab0888c1c28c57063cf63a4f;p=thirdparty%2Fkrb5.git

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 0c0daec546..4eab100c35 100644
--- 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;