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

use krb5_socket_t

Browse Source
This commit is contained in:
Love Hornquist Astrand
2009-12-23 14:12:38 +01:00
parent 160ddd0e43
commit be73fa4687
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kadmin/kadm_conn.c
View File

@@ -124,7 +124,7 @@ spawn_child(krb5_context context, int *socks,
struct sockaddr_storage __ss; struct sockaddr_storage __ss;
struct sockaddr *sa = (struct sockaddr *)&__ss; struct sockaddr *sa = (struct sockaddr *)&__ss;
socklen_t sa_size = sizeof(__ss); socklen_t sa_size = sizeof(__ss);
SOCKET s; krb5_socket_t s;
pid_t pid; pid_t pid;
krb5_address addr; krb5_address addr;
char buf[128]; char buf[128];
@@ -165,7 +165,7 @@ spawn_child(krb5_context context, int *socks,
static int static int
wait_for_connection(krb5_context context, wait_for_connection(krb5_context context,
SOCKET *socks, unsigned int num_socks) krb5_socket_t *socks, unsigned int num_socks)
{ {
unsigned int i; unsigned int i;
int e; int e;
@@ -226,7 +226,7 @@ start_server(krb5_context context)
int e; int e;
struct kadm_port *p; struct kadm_port *p;
SOCKET *socks = NULL, *tmp; krb5_socket_t *socks = NULL, *tmp;
unsigned int num_socks = 0; unsigned int num_socks = 0;
int i; int i;
@@ -259,7 +259,7 @@ start_server(krb5_context context)
} }
socks = tmp; socks = tmp;
for(ap = ai; ap; ap = ap->ai_next) { for(ap = ai; ap; ap = ap->ai_next) {
SOCKET s = socket(ap->ai_family, ap->ai_socktype, ap->ai_protocol); krb5_socket_t s = socket(ap->ai_family, ap->ai_socktype, ap->ai_protocol);
if(rk_IS_BAD_SOCKET(s)) { if(rk_IS_BAD_SOCKET(s)) {
krb5_warn(context, rk_SOCK_ERRNO, "socket"); krb5_warn(context, rk_SOCK_ERRNO, "socket");
continue; continue;

2
kadmin/kadmind.c
View File

@@ -95,7 +95,7 @@ main(int argc, char **argv)
int i; int i;
krb5_log_facility *logfacility; krb5_log_facility *logfacility;
krb5_keytab keytab; krb5_keytab keytab;
SOCKET sfd = INVALID_SOCKET; krb5_socket_t sfd = rk_INVALID_SOCKET;
setprogname(argv[0]); setprogname(argv[0]);

2
kadmin/rpc.c
View File

@@ -1091,7 +1091,7 @@ process_stream(krb5_context context,
int int
handle_mit(krb5_context context, void *buf, size_t len, SOCKET sock) handle_mit(krb5_context context, void *buf, size_t len, krb5_socket_t sock)
{ {
krb5_storage *sp; krb5_storage *sp;

6
kadmin/server.c
View File

@@ -440,7 +440,7 @@ v5_loop (krb5_context context,
krb5_auth_context ac, krb5_auth_context ac,
krb5_boolean initial, krb5_boolean initial,
void *kadm_handle, void *kadm_handle,
SOCKET fd) krb5_socket_t fd)
{ {
krb5_error_code ret; krb5_error_code ret;
krb5_data in, out; krb5_data in, out;
@@ -476,7 +476,7 @@ match_appl_version(const void *data, const char *appl_version)
static void static void
handle_v5(krb5_context context, handle_v5(krb5_context context,
krb5_keytab keytab, krb5_keytab keytab,
SOCKET fd) krb5_socket_t fd)
{ {
krb5_error_code ret; krb5_error_code ret;
krb5_ticket *ticket; krb5_ticket *ticket;
@@ -539,7 +539,7 @@ handle_v5(krb5_context context,
krb5_error_code krb5_error_code
kadmind_loop(krb5_context context, kadmind_loop(krb5_context context,
krb5_keytab keytab, krb5_keytab keytab,
SOCKET sock) krb5_socket_t sock)
{ {
u_char buf[sizeof(KRB5_SENDAUTH_VERSION) + 4]; u_char buf[sizeof(KRB5_SENDAUTH_VERSION) + 4];
ssize_t n; ssize_t n;

6
lib/roken/test-mini_inetd.c
View File

@@ -82,7 +82,7 @@ get_connected_socket(rk_socket_t * s_ret)
goto done; goto done;
*s_ret = s; *s_ret = s;
s = INVALID_SOCKET; s = rk_INVALID_SOCKET;
rv = 0; rv = 0;
done: done:
@@ -105,7 +105,7 @@ const char * test_strings[] = {
static int static int
test_simple_echo_client(void) test_simple_echo_client(void)
{ {
rk_socket_t s = INVALID_SOCKET; rk_socket_t s = rk_INVALID_SOCKET;
int rv; int rv;
char buf[81]; char buf[81];
int i; int i;
@@ -165,7 +165,7 @@ test_simple_echo_socket(void)
return test_simple_echo_client(); return test_simple_echo_client();
} else { } else {
rk_socket_t s = INVALID_SOCKET; rk_socket_t s = rk_INVALID_SOCKET;
fprintf (stderr, "[%s] Listening for connections...\n", prog); fprintf (stderr, "[%s] Listening for connections...\n", prog);
mini_inetd(htons(PORT), &s); mini_inetd(htons(PORT), &s);