From b570216b422b88d25b74e290cba10e875ead364a Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Thu, 21 Mar 1996 05:18:00 +0000 Subject: [PATCH] g_imp_sec_context.c (gss_import_sec_context): g_exp_sec_context.c (gss_export_sec_context): Fix 16bit vs 32bit lint flame. g_glue.c, g_initialize.c: Add include of string.h, as it is needed. g_acquire_cred.c, g_inq_cred.c: Add include of time.h g_rel_oid_set.c (gss_release_oid_set): Removed unused variable. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7695 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/gssapi/mechglue/ChangeLog | 14 ++++++++++++++ src/lib/gssapi/mechglue/g_acquire_cred.c | 1 + src/lib/gssapi/mechglue/g_exp_sec_context.c | 4 ++-- src/lib/gssapi/mechglue/g_glue.c | 1 + src/lib/gssapi/mechglue/g_imp_sec_context.c | 5 +++-- src/lib/gssapi/mechglue/g_initialize.c | 1 + src/lib/gssapi/mechglue/g_inq_cred.c | 1 + src/lib/gssapi/mechglue/g_rel_oid_set.c | 1 - 8 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/lib/gssapi/mechglue/ChangeLog b/src/lib/gssapi/mechglue/ChangeLog index e07d39cdb..6967119ed 100644 --- a/src/lib/gssapi/mechglue/ChangeLog +++ b/src/lib/gssapi/mechglue/ChangeLog @@ -1,5 +1,19 @@ +Thu Mar 21 00:12:07 1996 Theodore Y. Ts'o + + * g_imp_sec_context.c (gss_import_sec_context): + * g_exp_sec_context.c (gss_export_sec_context): Fix 16bit vs 32bit + lint flame. + Wed Mar 20 20:20:38 1996 Theodore Y. Ts'o + * g_glue.c: + * g_initialize.c: Add include of string.h, as it is needed. + + * g_acquire_cred.c: + * g_inq_cred.c: Add include of time.h + + * g_rel_oid_set.c (gss_release_oid_set): Removed unused variable. + * mechglue.h: Don't include ; it's included if necessary in gssapi/gssapi.h. On a Macintosh, #include gssapi.h instead of gssapi/gssapi.h. diff --git a/src/lib/gssapi/mechglue/g_acquire_cred.c b/src/lib/gssapi/mechglue/g_acquire_cred.c index 73b5c7d50..64a57db6e 100644 --- a/src/lib/gssapi/mechglue/g_acquire_cred.c +++ b/src/lib/gssapi/mechglue/g_acquire_cred.c @@ -33,6 +33,7 @@ #endif #include #include +#include #define g_OID_equal(o1,o2) \ (((o1)->length == (o2)->length) && \ diff --git a/src/lib/gssapi/mechglue/g_exp_sec_context.c b/src/lib/gssapi/mechglue/g_exp_sec_context.c index 1af42ac39..61488c70b 100644 --- a/src/lib/gssapi/mechglue/g_exp_sec_context.c +++ b/src/lib/gssapi/mechglue/g_exp_sec_context.c @@ -45,7 +45,7 @@ gss_buffer_t interprocess_token; { OM_uint32 status; - OM_uint32 length; + size_t length; gss_union_ctx_id_t ctx; gss_mechanism mech; gss_buffer_desc token; @@ -90,7 +90,7 @@ gss_buffer_t interprocess_token; buf[1] = (unsigned char) (length & 0xFF); length >>= 8; buf[0] = (unsigned char) (length & 0xFF); - memcpy(buf+4, ctx->mech_type->elements, ctx->mech_type->length); + memcpy(buf+4, ctx->mech_type->elements, (size_t) ctx->mech_type->length); memcpy(buf+4+ctx->mech_type->length, token.value, token.length); (void) gss_release_buffer(minor_status, &token); diff --git a/src/lib/gssapi/mechglue/g_glue.c b/src/lib/gssapi/mechglue/g_glue.c index 4e8a0300c..6aecab7fb 100644 --- a/src/lib/gssapi/mechglue/g_glue.c +++ b/src/lib/gssapi/mechglue/g_glue.c @@ -27,6 +27,7 @@ #ifdef HAVE_STDLIB_H #include #endif +#include #include #define g_OID_equal(o1,o2) \ diff --git a/src/lib/gssapi/mechglue/g_imp_sec_context.c b/src/lib/gssapi/mechglue/g_imp_sec_context.c index 9d977c61c..c7ed23d6b 100644 --- a/src/lib/gssapi/mechglue/g_imp_sec_context.c +++ b/src/lib/gssapi/mechglue/g_imp_sec_context.c @@ -44,7 +44,8 @@ gss_buffer_t interprocess_token; gss_ctx_id_t * context_handle; { - OM_uint32 length, status; + size_t length; + OM_uint32 status; char *p; gss_union_ctx_id_t ctx; gss_buffer_desc token; @@ -76,7 +77,7 @@ gss_ctx_id_t * context_handle; length = (length << 8) + *p++; ctx->mech_type->length = length; - ctx->mech_type->elements = malloc((size_t) length); + ctx->mech_type->elements = malloc(length); if (!ctx->mech_type->elements) { *minor_status = ENOMEM; goto error_out; diff --git a/src/lib/gssapi/mechglue/g_initialize.c b/src/lib/gssapi/mechglue/g_initialize.c index cc30e26e7..c6cd71dd5 100644 --- a/src/lib/gssapi/mechglue/g_initialize.c +++ b/src/lib/gssapi/mechglue/g_initialize.c @@ -32,6 +32,7 @@ #endif #include +#include #include #include diff --git a/src/lib/gssapi/mechglue/g_inq_cred.c b/src/lib/gssapi/mechglue/g_inq_cred.c index 12efbd29f..ae6493742 100644 --- a/src/lib/gssapi/mechglue/g_inq_cred.c +++ b/src/lib/gssapi/mechglue/g_inq_cred.c @@ -32,6 +32,7 @@ #include #endif #include +#include OM_uint32 INTERFACE gss_inquire_cred(minor_status, diff --git a/src/lib/gssapi/mechglue/g_rel_oid_set.c b/src/lib/gssapi/mechglue/g_rel_oid_set.c index bbe44e598..e52057f22 100644 --- a/src/lib/gssapi/mechglue/g_rel_oid_set.c +++ b/src/lib/gssapi/mechglue/g_rel_oid_set.c @@ -40,7 +40,6 @@ OM_uint32 * minor_status; gss_OID_set * set; { size_t index; - OM_uint32 temp_minor; gss_OID oid; if (minor_status) *minor_status = 0; -- 2.26.2