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 96275ca7b08cb0a7933e8a0d16ee708c130e8d3f..31b3c6efb04b6d22f360b5c4b40a0c7437eed622 100644 (file)
--- 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 59bce3cb06b2a742c94814b8dfbb71153673259a..ba8716be04949867e7496e81e6f721435ffcbbd8 100644 (file)
--- 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 30ca82c413dfcf3862cf6bad973167ba6e1e691c..e05944f29005d2ddbe07ca561c12702dcbdc8fd9 100644 (file)
--- 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;
     }