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

use rk_closesocket

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

10
kadmin/kadm_conn.c
View File

@@ -151,14 +151,14 @@ spawn_child(krb5_context context, int *socks,
pid = fork(); pid = fork();
if(pid == 0) { if(pid == 0) {
for(i = 0; i < num_socks; i++) for(i = 0; i < num_socks; i++)
closesocket(socks[i]); rk_closesocket(socks[i]);
dup2(s, STDIN_FILENO); dup2(s, STDIN_FILENO);
dup2(s, STDOUT_FILENO); dup2(s, STDOUT_FILENO);
if(s != STDIN_FILENO && s != STDOUT_FILENO) if(s != STDIN_FILENO && s != STDOUT_FILENO)
closesocket(s); rk_closesocket(s);
return 0; return 0;
} else { } else {
closesocket(s); rk_closesocket(s);
} }
return 1; return 1;
} }
@@ -270,12 +270,12 @@ start_server(krb5_context context)
if (rk_IS_SOCKET_ERROR(bind (s, ap->ai_addr, ap->ai_addrlen))) { if (rk_IS_SOCKET_ERROR(bind (s, ap->ai_addr, ap->ai_addrlen))) {
krb5_warn(context, rk_SOCK_ERRNO, "bind"); krb5_warn(context, rk_SOCK_ERRNO, "bind");
closesocket(s); rk_closesocket(s);
continue; continue;
} }
if (rk_IS_SOCKET_ERROR(listen (s, SOMAXCONN))) { if (rk_IS_SOCKET_ERROR(listen (s, SOMAXCONN))) {
krb5_warn(context, rk_SOCK_ERRNO, "listen"); krb5_warn(context, rk_SOCK_ERRNO, "listen");
closesocket(s); rk_closesocket(s);
continue; continue;
} }
socks[num_socks++] = s; socks[num_socks++] = s;

2
lib/kadm5/destroy_s.c
View File

@@ -56,7 +56,7 @@ static void
destroy_kadm5_log_context (kadm5_log_context *c) destroy_kadm5_log_context (kadm5_log_context *c)
{ {
free (c->log_file); free (c->log_file);
closesocket (c->socket_fd); rk_closesocket (c->socket_fd);
#ifndef NO_UNIX_SOCKETS #ifndef NO_UNIX_SOCKETS
if (c->socket_info) { if (c->socket_info) {
freeaddrinfo(c->socket_info); freeaddrinfo(c->socket_info);

4
lib/kadm5/ipropd_master.c
View File

@@ -196,7 +196,7 @@ slave_dead(krb5_context context, slave *s)
krb5_warnx(context, "slave %s dead", s->name); krb5_warnx(context, "slave %s dead", s->name);
if (!rk_IS_BAD_SOCKET(s->fd)) { if (!rk_IS_BAD_SOCKET(s->fd)) {
closesocket (s->fd); rk_closesocket (s->fd);
s->fd = rk_INVALID_SOCKET; s->fd = rk_INVALID_SOCKET;
} }
s->flags |= SLAVE_F_DEAD; s->flags |= SLAVE_F_DEAD;
@@ -209,7 +209,7 @@ remove_slave (krb5_context context, slave *s, slave **root)
slave **p; slave **p;
if (!rk_IS_BAD_SOCKET(s->fd)) if (!rk_IS_BAD_SOCKET(s->fd))
closesocket (s->fd); rk_closesocket (s->fd);
if (s->name) if (s->name)
free (s->name); free (s->name);
if (s->ac) if (s->ac)