From: Ben Kaduk <kaduk@mit.edu>
Date: Mon, 4 Nov 2013 18:09:13 +0000 (-0500)
Subject: Use retval, not errno, when stashing master keys
X-Git-Tag: krb5-1.13-alpha1~329
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51b5cef8387da33c2a61e5ebbf69a8702eece1d5;p=thirdparty%2Fkrb5.git

Use retval, not errno, when stashing master keys

The krb5_db_store_master_key{,_list} functions return a
krb5_error_code, and do not necessarily set errno on failure.
Use the correct variable while reporting errors with com_err().
---

diff --git a/src/kadmin/dbutil/kdb5_create.c b/src/kadmin/dbutil/kdb5_create.c
index 96275ca7b0..31b3c6efb0 100644
--- a/src/kadmin/dbutil/kdb5_create.c
+++ b/src/kadmin/dbutil/kdb5_create.c
@@ -341,7 +341,7 @@ void kdb5_create(argc, argv)
                                       &master_keyblock,
                                       mkey_password);
     if (retval) {
-        com_err(progname, errno, _("while storing key"));
+        com_err(progname, retval, _("while storing key"));
         printf(_("Warning: couldn't stash master key.\n"));
     }
     /* clean up */
diff --git a/src/kadmin/dbutil/kdb5_mkey.c b/src/kadmin/dbutil/kdb5_mkey.c
index 59bce3cb06..ba8716be04 100644
--- a/src/kadmin/dbutil/kdb5_mkey.c
+++ b/src/kadmin/dbutil/kdb5_mkey.c
@@ -337,7 +337,7 @@ kdb5_add_mkey(int argc, char *argv[])
                                           &new_mkeyblock,
                                           mkey_password);
         if (retval) {
-            com_err(progname, errno, _("while storing key"));
+            com_err(progname, retval, _("while storing key"));
             printf(_("Warning: couldn't stash master key.\n"));
         }
     }
diff --git a/src/kadmin/dbutil/kdb5_stash.c b/src/kadmin/dbutil/kdb5_stash.c
index 30ca82c413..e05944f290 100644
--- a/src/kadmin/dbutil/kdb5_stash.c
+++ b/src/kadmin/dbutil/kdb5_stash.c
@@ -130,7 +130,7 @@ kdb5_stash(argc, argv)
     retval = krb5_db_store_master_key_list(util_context, keyfile, master_princ,
                                            NULL);
     if (retval) {
-        com_err(progname, errno, _("while storing key"));
+        com_err(progname, retval, _("while storing key"));
         exit_status++; return;
     }