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

cleanup

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8547 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2000-07-05 13:10:46 +00:00
parent 0e3158a838
commit 904ae57b04
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/hdb/convert_db.c
View File

@@ -132,7 +132,6 @@ main(int argc, char **argv)
krb5_error_code ret; krb5_error_code ret;
krb5_context context; krb5_context context;
HDB *db, *new; HDB *db, *new;
EncryptionKey key;
int optind = 0; int optind = 0;
int master_key_set = 0; int master_key_set = 0;
@@ -157,23 +156,17 @@ main(int argc, char **argv)
if(ret != 0) if(ret != 0)
krb5_err(context, 1, ret, "hdb_create"); krb5_err(context, 1, ret, "hdb_create");
ret = hdb_read_master_key(context, mkeyfile, &key); ret = hdb_set_master_keyfile(context, db, mkeyfile);
if(ret == 0) { if (ret)
if(key.keytype == KEYTYPE_DES) krb5_err(context, 1, ret, "hdb_set_master_keyfile");
key.keytype = ETYPE_DES_CBC_MD5; master_key_set = 1;
ret = hdb_set_master_key(context, db, key);
if (ret)
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) { if (master_key_set) {
ret = hdb_set_master_key(context, new, key); ret = hdb_set_master_keyfile(context, new, mkeyfile);
if (ret) if (ret)
krb5_err(context, 1, ret, "hdb_set_master_key"); krb5_err(context, 1, ret, "hdb_set_master_keyfile");
} }
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) {