diff options
| author | Paul Park <pjpark@mit.edu> | 1995-08-10 18:56:43 +0000 |
|---|---|---|
| committer | Paul Park <pjpark@mit.edu> | 1995-08-10 18:56:43 +0000 |
| commit | 1752db3014e1d8416ab8ef49eede1e198e1607b5 (patch) | |
| tree | 40ad33ad40fc5f2afb5f9de3d9ee23e7b16d14cb /src/kadmin.old/server/adm_server.c | |
| parent | fc78412f2fee2e4f15f464f390f8c9251436b093 (diff) | |
| download | krb5-1752db3014e1d8416ab8ef49eede1e198e1607b5.tar.gz krb5-1752db3014e1d8416ab8ef49eede1e198e1607b5.tar.xz krb5-1752db3014e1d8416ab8ef49eede1e198e1607b5.zip | |
Use adm_find_keytype() and adm_update_tl_attrs() to handle new db format
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6502 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin.old/server/adm_server.c')
| -rw-r--r-- | src/kadmin.old/server/adm_server.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/kadmin.old/server/adm_server.c b/src/kadmin.old/server/adm_server.c index a8cb92f4a..fcb95b08a 100644 --- a/src/kadmin.old/server/adm_server.c +++ b/src/kadmin.old/server/adm_server.c @@ -277,6 +277,7 @@ init_db(context, dbname, masterkeyname, masterkeyblock) int number_of_entries; char tgs_name[255]; krb5_keysalt salt; + krb5_key_data *kdatap; /* set db name if appropriate */ if (dbname && (retval = krb5_db_set_name(context, dbname))) @@ -358,8 +359,18 @@ init_db(context, dbname, masterkeyname, masterkeyblock) convert server.key into a real key (it may be encrypted in the database) */ + if (retval = adm_find_keytype(&server_entry, + KEYTYPE_DES, + -1, + &kdatap)) { + krb5_db_free_principal(context, &server_entry, number_of_entries); + (void) krb5_finish_key(context, &master_encblock); + memset((char *)&master_encblock, 0, sizeof(master_encblock)); + (void) krb5_db_fini(context); + return(retval); + } if (retval = krb5_dbekd_decrypt_key_data(context,&master_encblock, - &server_entry.key_data[0],&tgs_key, + kdatap,&tgs_key, &salt)) { krb5_db_free_principal(context, &server_entry, number_of_entries); (void) krb5_finish_key(context, &master_encblock); @@ -368,7 +379,7 @@ init_db(context, dbname, masterkeyname, masterkeyblock) return(retval); } - tgs_kvno = server_entry.key_data[0].key_data_kvno; + tgs_kvno = kdatap->key_data_kvno; krb5_db_free_principal(context, &server_entry, number_of_entries); return(0); } |