include file name in error messages
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9621 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 1997-2000 Kungliga Tekniska H<>gskolan
|
* Copyright (c) 1997-2001 Kungliga Tekniska H<>gskolan
|
||||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
@@ -84,9 +84,12 @@ main(int argc, char **argv)
|
|||||||
|
|
||||||
ret = hdb_read_master_key(context, keyfile, &mkey);
|
ret = hdb_read_master_key(context, keyfile, &mkey);
|
||||||
if(ret && ret != ENOENT)
|
if(ret && ret != ENOENT)
|
||||||
krb5_err(context, 1, ret, "reading master key");
|
krb5_err(context, 1, ret, "reading master key from %s", keyfile);
|
||||||
|
|
||||||
if(!convert_flag) {
|
if (convert_flag) {
|
||||||
|
if (ret)
|
||||||
|
krb5_err(context, 1, ret, "reading master key from %s", keyfile);
|
||||||
|
} else {
|
||||||
krb5_keyblock key;
|
krb5_keyblock key;
|
||||||
krb5_salt salt;
|
krb5_salt salt;
|
||||||
salt.salttype = KRB5_PW_SALT;
|
salt.salttype = KRB5_PW_SALT;
|
||||||
|
Reference in New Issue
Block a user