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

Eliminate unused variable warning.

Browse Source
This commit is contained in:
Roland C. Dowdeswell
2012-05-21 13:33:42 +01:00
parent a3947acb38
commit ac18aa10dc
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/hdb/print.c
View File

@@ -149,6 +149,7 @@ append_mit_key(krb5_context context, krb5_storage *sp,
unsigned int kvno, Key *key) unsigned int kvno, Key *key)
{ {
krb5_error_code ret; krb5_error_code ret;
krb5_salt k5salt;
ssize_t sz; ssize_t sz;
size_t key_versions = key->salt ? 2 : 1; size_t key_versions = key->salt ? 2 : 1;
size_t decrypted_key_length; size_t decrypted_key_length;
@@ -156,6 +157,7 @@ append_mit_key(krb5_context context, krb5_storage *sp,
krb5_data keylenbytes; krb5_data keylenbytes;
unsigned int salttype; unsigned int salttype;
sz = append_string(context, sp, "\t%u\t%u\t%d\t%d\t", key_versions, kvno, sz = append_string(context, sp, "\t%u\t%u\t%d\t%d\t", key_versions, kvno,
key->key.keytype, key->key.keyvalue.length + 2); key->key.keytype, key->key.keyvalue.length + 2);
if (sz == -1) return sz; if (sz == -1) return sz;
@@ -172,8 +174,8 @@ append_mit_key(krb5_context context, krb5_storage *sp,
return sz; return sz;
/* Map salt to MIT KDB style */ /* Map salt to MIT KDB style */
if (key->salt->type == KRB5_PADATA_PW_SALT) { switch (key->salt->type) {
krb5_salt k5salt; case KRB5_PADATA_PW_SALT:
/* /*
* Compute normal salt and then see whether it matches the stored one * Compute normal salt and then see whether it matches the stored one
@@ -188,16 +190,24 @@ append_mit_key(krb5_context context, krb5_storage *sp,
memcmp(key->salt->salt.data, princ->realm, memcmp(key->salt->salt.data, princ->realm,
key->salt->salt.length) == 0) key->salt->salt.length) == 0)
salttype = KRB5_KDB_SALTTYPE_ONLYREALM; /* matches realm */ salttype = KRB5_KDB_SALTTYPE_ONLYREALM; /* matches realm */
else if (key->salt->salt.length == k5salt.saltvalue.length - strlen(princ->realm) && else if (key->salt->salt.length ==
k5salt.saltvalue.length - strlen(princ->realm) &&
memcmp((char *)k5salt.saltvalue.data + strlen(princ->realm), memcmp((char *)k5salt.saltvalue.data + strlen(princ->realm),
key->salt->salt.data, key->salt->salt.length) == 0) key->salt->salt.data, key->salt->salt.length) == 0)
salttype = KRB5_KDB_SALTTYPE_NOREALM; /* matches w/o realm */ salttype = KRB5_KDB_SALTTYPE_NOREALM; /* matches w/o realm */
else else
salttype = KRB5_KDB_SALTTYPE_NORMAL; /* hope for best */ salttype = KRB5_KDB_SALTTYPE_NORMAL; /* hope for best */
} else if (key->salt->type == KRB5_PADATA_AFS3_SALT) { break;
case KRB5_PADATA_AFS3_SALT:
salttype = KRB5_KDB_SALTTYPE_AFS3; salttype = KRB5_KDB_SALTTYPE_AFS3;
break;
default:
return -1;
} }
sz = append_string(context, sp, "\t%u\t%u\t", salttype, sz = append_string(context, sp, "\t%u\t%u\t", salttype,
key->salt->salt.length); key->salt->salt.length);
if (sz == -1) return sz; if (sz == -1) return sz;