diff options
| author | Ben Kaduk <kaduk@mit.edu> | 2013-11-04 13:09:13 -0500 |
|---|---|---|
| committer | Ben Kaduk <kaduk@mit.edu> | 2013-11-04 13:33:02 -0500 |
| commit | 51b5cef8387da33c2a61e5ebbf69a8702eece1d5 (patch) | |
| tree | 6e1bee4c33aa356bf580709c31b14f33c55520a0 /src/kadmin | |
| parent | bfec0671ca6df811453d46a2f47afc7168b980fc (diff) | |
| download | krb5-51b5cef8387da33c2a61e5ebbf69a8702eece1d5.tar.gz krb5-51b5cef8387da33c2a61e5ebbf69a8702eece1d5.tar.xz krb5-51b5cef8387da33c2a61e5ebbf69a8702eece1d5.zip | |
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().
Diffstat (limited to 'src/kadmin')
| -rw-r--r-- | src/kadmin/dbutil/kdb5_create.c | 2 | ||||
| -rw-r--r-- | src/kadmin/dbutil/kdb5_mkey.c | 2 | ||||
| -rw-r--r-- | src/kadmin/dbutil/kdb5_stash.c | 2 |
3 files changed, 3 insertions, 3 deletions
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; } |