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

remove #if 0 codeblock

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@25196 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2009-05-06 19:04:38 +00:00
parent c9d5eca012
commit ecc751b6dd
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/hdb/mkey.c
View File

@@ -169,25 +169,24 @@ read_master_mit(krb5_context context, const char *filename,
return errno; return errno;
} }
krb5_storage_set_flags(sp, KRB5_STORAGE_HOST_BYTEORDER); krb5_storage_set_flags(sp, KRB5_STORAGE_HOST_BYTEORDER);
#if 0
/* could possibly use ret_keyblock here, but do it with more /* could possibly use ret_keyblock here, but do it with more
checks for now */ checks for now */
ret = krb5_ret_keyblock(sp, &key); {
#else ret = krb5_ret_int16(sp, &enctype);
ret = krb5_ret_int16(sp, &enctype); if (ret)
if (ret) goto out;
goto out; if((htons(enctype) & 0xff00) == 0x3000) {
if((htons(enctype) & 0xff00) == 0x3000) { ret = HEIM_ERR_BAD_MKEY;
ret = HEIM_ERR_BAD_MKEY; krb5_set_error_message(context, ret, "unknown keytype in %s: "
krb5_set_error_message(context, ret, "unknown keytype in %s: %#x, expected %#x", "%#x, expected %#x",
filename, htons(enctype), 0x3000); filename, htons(enctype), 0x3000);
goto out; goto out;
}
key.keytype = enctype;
ret = krb5_ret_data(sp, &key.keyvalue);
if(ret)
goto out;
} }
key.keytype = enctype;
ret = krb5_ret_data(sp, &key.keyvalue);
if(ret)
goto out;
#endif
ret = hdb_process_master_key(context, 0, &key, 0, mkey); ret = hdb_process_master_key(context, 0, &key, 0, mkey);
krb5_free_keyblock_contents(context, &key); krb5_free_keyblock_contents(context, &key);
out: out: