diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2000-09-20 19:33:21 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2000-09-20 19:33:21 +0000 |
| commit | d48a413078fd1a0e681e741634a54dc9c92631a9 (patch) | |
| tree | 6b9fce08bea030bc4ec90177e9459701bd6f5da6 /src/lib/kdb/fetch_mkey.c | |
| parent | 29abad610e5a44a6c589059d2730a47bb16dec99 (diff) | |
| download | krb5-d48a413078fd1a0e681e741634a54dc9c92631a9.tar.gz krb5-d48a413078fd1a0e681e741634a54dc9c92631a9.tar.xz krb5-d48a413078fd1a0e681e741634a54dc9c92631a9.zip | |
* kdb_xdr.c (krb5_dbe_free_contents): Clean up signedness warning
* fetch_mkey.c (krb5_db_fetch_mkey): Clean up signedness warnings.
* kdb_db2.c (destroy_file_suffix): Declare function as
static. Rewrite code to use off_t and unsigned ints to handle gcc
warnings. (kdb5_context_internalize) Unmarshal boolean type properly.
* store_mkey.c (krb5_db_store_mkey): Use mode_t instead of int in
call to umask.
* configure.in: Add AC_TYPE_MODE_T and AC_TYPE_OFF_T for mode_t
and off_t declarations.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12661 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/kdb/fetch_mkey.c')
| -rw-r--r-- | src/lib/kdb/fetch_mkey.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/kdb/fetch_mkey.c b/src/lib/kdb/fetch_mkey.c index 7ae26bbb9c..b8e182af7c 100644 --- a/src/lib/kdb/fetch_mkey.c +++ b/src/lib/kdb/fetch_mkey.c @@ -126,6 +126,7 @@ krb5_db_fetch_mkey(context, mname, etype, fromkeyboard, twice, keyfile, char defkeyfile[MAXPATHLEN+1]; krb5_data *realm = krb5_princ_realm(context, mname); FILE *kf; + unsigned int len; retval = 0; key->magic = KV5M_KEYBLOCK; @@ -160,14 +161,18 @@ krb5_db_fetch_mkey(context, mname, etype, fromkeyboard, twice, keyfile, retval = KRB5_KDB_BADSTORED_MKEY; goto errout; } - if (!(key->contents = (krb5_octet *)malloc(key->length))) { + + /* Provide an unsigned int */ + len = key->length; + if (!(key->contents = (krb5_octet *)malloc(len))) { retval = ENOMEM; goto errout; } if (fread((krb5_pointer) key->contents, - sizeof(key->contents[0]), key->length, kf) != key->length) { + sizeof(key->contents[0]), len, kf) + != key->length) { retval = KRB5_KDB_CANTREAD_STORED; - memset(key->contents, 0, key->length); + memset(key->contents, 0, len); free(key->contents); key->contents = 0; } else |