diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2008-06-02 23:04:09 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2008-06-02 23:04:09 +0000 |
| commit | 10983562979887f84bb5148ebe08a6b284d79451 (patch) | |
| tree | 03a9c2a04895f29dcad0d6b5fc9a91f022b87e09 /src/lib/gssapi | |
| parent | 7da16b5b7cc56806bd7fbff3295ce9e9e18efba0 (diff) | |
| download | krb5-10983562979887f84bb5148ebe08a6b284d79451.tar.gz krb5-10983562979887f84bb5148ebe08a6b284d79451.tar.xz krb5-10983562979887f84bb5148ebe08a6b284d79451.zip | |
Fix a few incompatible-pointer warnings that aren't just about signedness
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20351 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/gssapi')
| -rw-r--r-- | src/lib/gssapi/generic/util_errmap.c | 4 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/ser_sctx.c | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/lib/gssapi/generic/util_errmap.c b/src/lib/gssapi/generic/util_errmap.c index 5cd554cde..4142c3c06 100644 --- a/src/lib/gssapi/generic/util_errmap.c +++ b/src/lib/gssapi/generic/util_errmap.c @@ -1,5 +1,5 @@ /* - * Copyright 2007 by the Massachusetts Institute of Technology. + * Copyright 2007, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * * Export of this software from the United States of America may @@ -152,7 +152,7 @@ int gssint_mecherrmap_init(void) /* Currently the enumeration template doesn't handle freeing element storage when destroying the collection. */ -static int free_one(size_t i, struct mecherror value, void *p) +static int free_one(OM_uint32 i, struct mecherror value, void *p) { if (value.mech.length && value.mech.elements) free(value.mech.elements); diff --git a/src/lib/gssapi/krb5/ser_sctx.c b/src/lib/gssapi/krb5/ser_sctx.c index 00ea78254..92bb302f0 100644 --- a/src/lib/gssapi/krb5/ser_sctx.c +++ b/src/lib/gssapi/krb5/ser_sctx.c @@ -1,7 +1,7 @@ /* * lib/gssapi/krb5/ser_sctx.c * - * Copyright 1995, 2004 by the Massachusetts Institute of Technology. + * Copyright 1995, 2004, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * * Export of this software from the United States of America may @@ -561,10 +561,14 @@ kg_ctx_internalize(kcontext, argp, buffer, lenremain) return kret; } - if ((kret = kg_oid_internalize(kcontext, &ctx->mech_used, &bp, - &remain))) { - if (kret == EINVAL) - kret = 0; + { + krb5_pointer tmp; + kret = kg_oid_internalize(kcontext, &tmp, &bp, + &remain); + if (kret == 0) + ctx->mech_used = tmp; + else if (kret == EINVAL) + kret = 0; } /* Now get substructure data */ if ((kret = krb5_internalize_opaque(kcontext, |