From 62d913a551f45064d34fc5ac1078587ef2c8ae5c Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Sun, 12 Jul 2020 14:20:44 +1000 Subject: [PATCH] gssapi/krb5: use GSS_IOV_BUFFER_FLAG_ALLOCATE constants GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATE is deprecated as indicated in gssapi.h, use GSS_IOV_BUFFER_FLAG_ALLOCATE instead --- lib/gssapi/krb5/arcfour.c | 4 ++-- lib/gssapi/test_context.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/gssapi/krb5/arcfour.c b/lib/gssapi/krb5/arcfour.c index ea3dbf7eb..ffe4e9618 100644 --- a/lib/gssapi/krb5/arcfour.c +++ b/lib/gssapi/krb5/arcfour.c @@ -976,7 +976,7 @@ _gssapi_wrap_iov_arcfour(OM_uint32 *minor_status, header_len -= data_len; } - if (GSS_IOV_BUFFER_FLAGS(header->type) & GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATE) { + if (GSS_IOV_BUFFER_FLAGS(header->type) & GSS_IOV_BUFFER_FLAG_ALLOCATE) { major_status = _gk_allocate_buffer(minor_status, header, header_len); if (major_status != GSS_S_COMPLETE) @@ -990,7 +990,7 @@ _gssapi_wrap_iov_arcfour(OM_uint32 *minor_status, } if (padding) { - if (GSS_IOV_BUFFER_FLAGS(padding->type) & GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATE) { + if (GSS_IOV_BUFFER_FLAGS(padding->type) & GSS_IOV_BUFFER_FLAG_ALLOCATE) { major_status = _gk_allocate_buffer(minor_status, padding, 1); if (major_status != GSS_S_COMPLETE) goto failure; diff --git a/lib/gssapi/test_context.c b/lib/gssapi/test_context.c index 1d3ece826..fba8df07e 100644 --- a/lib/gssapi/test_context.c +++ b/lib/gssapi/test_context.c @@ -451,7 +451,7 @@ wrapunwrap_iov(gss_ctx_id_t cctx, gss_ctx_id_t sctx, int flags, gss_OID mechoid) memset(iov, 0, sizeof(iov)); - iov[0].type = GSS_IOV_BUFFER_TYPE_HEADER | GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATE; + iov[0].type = GSS_IOV_BUFFER_TYPE_HEADER | GSS_IOV_BUFFER_FLAG_ALLOCATE; if (header.length != 0) { iov[1].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY; @@ -481,7 +481,7 @@ wrapunwrap_iov(gss_ctx_id_t cctx, gss_ctx_id_t sctx, int flags, gss_OID mechoid) if (dce_style_flag) { iov[4].type = GSS_IOV_BUFFER_TYPE_EMPTY; } else { - iov[4].type = GSS_IOV_BUFFER_TYPE_PADDING | GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATE; + iov[4].type = GSS_IOV_BUFFER_TYPE_PADDING | GSS_IOV_BUFFER_FLAG_ALLOCATE; } iov[4].buffer.length = 0; iov[4].buffer.value = 0; @@ -490,7 +490,7 @@ wrapunwrap_iov(gss_ctx_id_t cctx, gss_ctx_id_t sctx, int flags, gss_OID mechoid) } else if (flags & USE_HEADER_ONLY) { iov[5].type = GSS_IOV_BUFFER_TYPE_EMPTY; } else { - iov[5].type = GSS_IOV_BUFFER_TYPE_TRAILER | GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATE; + iov[5].type = GSS_IOV_BUFFER_TYPE_TRAILER | GSS_IOV_BUFFER_FLAG_ALLOCATE; } iov[5].buffer.length = 0; iov[5].buffer.value = 0;