oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

only get master key if we're actually going to use it; enable reading

Browse Source 
of MIT krb5 dump files


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8553 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2000-07-05 19:29:32 +00:00
parent 326dfb8181
commit c7b49a1830
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
kdc/hprop.c
View File

@@ -404,9 +404,7 @@ struct getargs args[] = {
{ "database", 'd', arg_string, &database, "database", "file" }, { "database", 'd', arg_string, &database, "database", "file" },
{ "source", 0, arg_string, &source_type, "type of database to read", { "source", 0, arg_string, &source_type, "type of database to read",
"heimdal" "heimdal"
#if 0
"|mit-dump" "|mit-dump"
#endif
#ifdef KRB4 #ifdef KRB4
"|krb4-db|krb4-dump" "|krb4-db|krb4-dump"
#ifdef KASERVER_DB #ifdef KASERVER_DB
@@ -547,11 +545,9 @@ iterate (krb5_context context,
} }
#endif #endif
#endif /* KRB4 */ #endif /* KRB4 */
#if 0
case HPROP_MIT_DUMP: case HPROP_MIT_DUMP:
mit_prop_dump(pd, database); mit_prop_dump(pd, database);
break; break;
#endif
case HPROP_HEIMDAL: { case HPROP_HEIMDAL: {
krb5_error_code ret = hdb_foreach(context, db, HDB_F_DECRYPT, krb5_error_code ret = hdb_foreach(context, db, HDB_F_DECRYPT,
v5_prop, pd); v5_prop, pd);
@@ -733,11 +729,11 @@ main(int argc, char **argv)
if(!to_stdout) if(!to_stdout)
get_creds(context, &ccache); get_creds(context, &ccache);
ret = hdb_read_master_key(context, mkeyfile, &mkey5); if(decrypt_flag || encrypt_flag) {
if(ret && ret != ENOENT) ret = hdb_read_master_key(context, mkeyfile, &mkey5);
krb5_err(context, 1, ret, "hdb_read_master_key"); if(ret && ret != ENOENT)
if(ret) { krb5_err(context, 1, ret, "hdb_read_master_key");
if(encrypt_flag || decrypt_flag) if(ret)
krb5_errx(context, 1, "No master key file found"); krb5_errx(context, 1, "No master key file found");
} }
@@ -783,10 +779,8 @@ main(int argc, char **argv)
break; break;
#endif #endif
#endif /* KRB4 */ #endif /* KRB4 */
#if 0
case HPROP_MIT_DUMP: case HPROP_MIT_DUMP:
break; break;
#endif
case HPROP_HEIMDAL: case HPROP_HEIMDAL:
ret = hdb_create (context, &db, database); ret = hdb_create (context, &db, database);
if(ret) if(ret)