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

(main): handle the case of no master key

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6179 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-05-09 22:47:47 +00:00
parent 21f9540e2f
commit adc6425e1c
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/hdb/convert_db.c
View File

@@ -134,6 +134,7 @@ main(int argc, char **argv)
HDB *db, *new; HDB *db, *new;
EncryptionKey key; EncryptionKey key;
int optind = 0; int optind = 0;
int master_key_set = 0;
set_progname(argv[0]); set_progname(argv[0]);
@@ -157,20 +158,23 @@ main(int argc, char **argv)
krb5_err(context, 1, ret, "hdb_create"); krb5_err(context, 1, ret, "hdb_create");
ret = hdb_read_master_key(context, mkeyfile, &key); ret = hdb_read_master_key(context, mkeyfile, &key);
if(ret) if(ret == 0) {
krb5_err(context, 1, ret, "hdb_read_master_key");
if(key.keytype == KEYTYPE_DES) if(key.keytype == KEYTYPE_DES)
key.keytype = ETYPE_DES_CBC_MD5; key.keytype = ETYPE_DES_CBC_MD5;
ret = hdb_set_master_key(context, db, key); ret = hdb_set_master_key(context, db, key);
if (ret) if (ret)
krb5_err(context, 1, ret, "hdb_set_master_key"); krb5_err(context, 1, ret, "hdb_set_master_key");
master_key_set = 1;
}
ret = hdb_create(context, &new, new_database); ret = hdb_create(context, &new, new_database);
if(ret != 0) if(ret != 0)
krb5_err(context, 1, ret, "hdb_create"); krb5_err(context, 1, ret, "hdb_create");
if (master_key_set) {
ret = hdb_set_master_key(context, new, key); ret = hdb_set_master_key(context, new, key);
if (ret) if (ret)
krb5_err(context, 1, ret, "hdb_set_master_key"); krb5_err(context, 1, ret, "hdb_set_master_key");
}
ret = db->open(context, db, O_RDONLY, 0); ret = db->open(context, db, O_RDONLY, 0);
if(ret == HDB_ERR_BADVERSION) { if(ret == HDB_ERR_BADVERSION) {
krb5_data tag; krb5_data tag;