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

Rename GSS_IOV_BUFFER_TYPE_FLAG to GSS_IOV_BUFFER_FLAG

Browse Source 
Signed-off-by: Love Hornquist Astrand <lha@h5l.org>
This commit is contained in:
Luke Howard
2011-01-03 22:13:20 +11:00
committed by Love Hornquist Astrand
parent 0b4f6bbfc2
commit 21c5987018
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/gssapi/krb5/cfx.c
View File

@@ -216,7 +216,7 @@ _gk_find_buffer(gss_iov_buffer_desc *iov, int iov_count, OM_uint32 type)
OM_uint32 OM_uint32
_gk_allocate_buffer(OM_uint32 *minor_status, gss_iov_buffer_desc *buffer, size_t size) _gk_allocate_buffer(OM_uint32 *minor_status, gss_iov_buffer_desc *buffer, size_t size)
{ {
if (buffer->type & GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATED) { if (buffer->type & GSS_IOV_BUFFER_FLAG_ALLOCATED) {
if (buffer->buffer.length == size) if (buffer->buffer.length == size)
return GSS_S_COMPLETE; return GSS_S_COMPLETE;
free(buffer->buffer.value); free(buffer->buffer.value);
@@ -228,7 +228,7 @@ _gk_allocate_buffer(OM_uint32 *minor_status, gss_iov_buffer_desc *buffer, size_t
*minor_status = ENOMEM; *minor_status = ENOMEM;
return GSS_S_FAILURE; return GSS_S_FAILURE;
} }
buffer->type |= GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATED; buffer->type |= GSS_IOV_BUFFER_FLAG_ALLOCATED;
return GSS_S_COMPLETE; return GSS_S_COMPLETE;
} }
@@ -391,7 +391,7 @@ _gssapi_wrap_cfx_iov(OM_uint32 *minor_status,
rrc -= ec; rrc -= ec;
gsshsize += gsstsize; gsshsize += gsstsize;
gsstsize = 0; gsstsize = 0;
} else if (GSS_IOV_BUFFER_FLAGS(trailer->type) & GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATE) { } else if (GSS_IOV_BUFFER_FLAGS(trailer->type) & GSS_IOV_BUFFER_FLAG_ALLOCATE) {
major_status = _gk_allocate_buffer(minor_status, trailer, gsstsize); major_status = _gk_allocate_buffer(minor_status, trailer, gsstsize);
if (major_status) if (major_status)
goto failure; goto failure;
@@ -406,7 +406,7 @@ _gssapi_wrap_cfx_iov(OM_uint32 *minor_status,
* *
*/ */
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, gsshsize); major_status = _gk_allocate_buffer(minor_status, header, gsshsize);
if (major_status != GSS_S_COMPLETE) if (major_status != GSS_S_COMPLETE)
goto failure; goto failure;

6
lib/gssapi/mech/gss_aeap.c
View File

@@ -157,7 +157,7 @@ gss_wrap_iov_length(OM_uint32 * minor_status,
/** /**
* Free all buffer allocated by gss_wrap_iov() or gss_unwrap_iov() by * Free all buffer allocated by gss_wrap_iov() or gss_unwrap_iov() by
* looking at the GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATED flag. * looking at the GSS_IOV_BUFFER_FLAG_ALLOCATED flag.
* *
* @ingroup gssapi * @ingroup gssapi
*/ */
@@ -176,10 +176,10 @@ gss_release_iov_buffer(OM_uint32 *minor_status,
return GSS_S_CALL_INACCESSIBLE_READ; return GSS_S_CALL_INACCESSIBLE_READ;
for (i = 0; i < iov_count; i++) { for (i = 0; i < iov_count; i++) {
if ((iov[i].type & GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATED) == 0) if ((iov[i].type & GSS_IOV_BUFFER_FLAG_ALLOCATED) == 0)
continue; continue;
gss_release_buffer(&junk, &iov[i].buffer); gss_release_buffer(&junk, &iov[i].buffer);
iov[i].type &= ~GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATED; iov[i].type &= ~GSS_IOV_BUFFER_FLAG_ALLOCATED;
} }
return GSS_S_COMPLETE; return GSS_S_COMPLETE;
} }

4
lib/gssapi/netlogon/crypto.c
View File

@@ -479,7 +479,7 @@ _netlogon_wrap_iov(OM_uint32 * minor_status,
size = _netlogon_signature_length(ctx->SignatureAlgorithm, conf_req_flag); size = _netlogon_signature_length(ctx->SignatureAlgorithm, conf_req_flag);
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) {
ret = _gss_mg_allocate_buffer(minor_status, header, size); ret = _gss_mg_allocate_buffer(minor_status, header, size);
if (GSS_ERROR(ret)) if (GSS_ERROR(ret))
return ret; return ret;
@@ -669,7 +669,7 @@ OM_uint32 _netlogon_get_mic
iov[0].type = GSS_IOV_BUFFER_TYPE_DATA; iov[0].type = GSS_IOV_BUFFER_TYPE_DATA;
iov[0].buffer = *message_buffer; iov[0].buffer = *message_buffer;
iov[1].type = GSS_IOV_BUFFER_TYPE_HEADER | GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATE; iov[1].type = GSS_IOV_BUFFER_TYPE_HEADER | GSS_IOV_BUFFER_FLAG_ALLOCATE;
iov[1].buffer.length = 0; iov[1].buffer.length = 0;
iov[1].buffer.value = NULL; iov[1].buffer.value = NULL;