dba026b5ef
On Windows a file descriptor is an int value allocated by the local module instance of the C Run Time Library. A socket handle is a SOCKET value allocated by a Winsock Provider for the requested family and protocol. These two values cannot be mixed and there is no mechanism for converting between the two. The _get_osfhandle() and _open_osfhandle() functions can work with a standard HANDLE (file, pipe, etc) but cannot be used for a SOCKET. The Heimdal krb5_storage_from_fd() routine counted on the osf conversion functions working on SOCKET values. Since they do not any attempt to call krb5_storage_from_fd() on a socket resulted in an assertion being thrown by the C RTL. Another problem is SOCKET value truncation when storing a 64-bit value into a 32-bit int. To address these problems a new krb5_storage_from_socket() routine is introduced. This routine setups a krb5_storage that stores a socket value as a rk_socket_t and provides a set of helper routines that always use network ready functions. The krb5_storage_from_fd() routines no longer use net_read() and net_write() but provide helpers that follow their logic so that pipes can be processed. All call sites that allocate a socket now store the socket as rk_socket_t and call krb5_storage_from_socket(). All locations that previously called the bare close() on a socket value now call rk_closesocket(). Change-Id: I045f775b2a5dbf5cf803751409490bc27fffe597
102 lines
3.2 KiB
C
102 lines
3.2 KiB
C
/*
|
|
* Copyright (c) 1997-2003, 2006 Kungliga Tekniska Högskolan
|
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
*
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* 3. Neither the name of the Institute nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "kadm5_locl.h"
|
|
|
|
RCSID("$Id$");
|
|
|
|
kadm5_ret_t
|
|
_kadm5_client_send(kadm5_client_context *context, krb5_storage *sp)
|
|
{
|
|
krb5_data msg, out;
|
|
krb5_error_code ret;
|
|
size_t len;
|
|
krb5_storage *sock;
|
|
|
|
assert(context->sock != rk_INVALID_SOCKET);
|
|
|
|
len = krb5_storage_seek(sp, 0, SEEK_CUR);
|
|
ret = krb5_data_alloc(&msg, len);
|
|
if (ret) {
|
|
krb5_clear_error_message(context->context);
|
|
return ret;
|
|
}
|
|
krb5_storage_seek(sp, 0, SEEK_SET);
|
|
krb5_storage_read(sp, msg.data, msg.length);
|
|
|
|
ret = krb5_mk_priv(context->context, context->ac, &msg, &out, NULL);
|
|
krb5_data_free(&msg);
|
|
if(ret)
|
|
return ret;
|
|
|
|
sock = krb5_storage_from_socket(context->sock);
|
|
if(sock == NULL) {
|
|
krb5_clear_error_message(context->context);
|
|
krb5_data_free(&out);
|
|
return ENOMEM;
|
|
}
|
|
|
|
ret = krb5_store_data(sock, out);
|
|
if (ret)
|
|
krb5_clear_error_message(context->context);
|
|
krb5_storage_free(sock);
|
|
krb5_data_free(&out);
|
|
return ret;
|
|
}
|
|
|
|
kadm5_ret_t
|
|
_kadm5_client_recv(kadm5_client_context *context, krb5_data *reply)
|
|
{
|
|
krb5_error_code ret;
|
|
krb5_data data;
|
|
krb5_storage *sock;
|
|
|
|
sock = krb5_storage_from_socket(context->sock);
|
|
if(sock == NULL) {
|
|
krb5_clear_error_message(context->context);
|
|
return ENOMEM;
|
|
}
|
|
ret = krb5_ret_data(sock, &data);
|
|
krb5_storage_free(sock);
|
|
krb5_clear_error_message(context->context);
|
|
if(ret == KRB5_CC_END)
|
|
return KADM5_RPC_ERROR;
|
|
else if(ret)
|
|
return ret;
|
|
|
|
ret = krb5_rd_priv(context->context, context->ac, &data, reply, NULL);
|
|
krb5_data_free(&data);
|
|
return ret;
|
|
}
|
|
|