projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ipliteral was not recognizing "ipv6" prefix.
[exim.git]
/
src
/
src
/
daemon.c
diff --git
a/src/src/daemon.c
b/src/src/daemon.c
index 974785c24282d61ce9a7375638bb27980bd30b29..55e14776fe508be16d062ae6b7b028bf9839981b 100644
(file)
--- a/
src/src/daemon.c
+++ b/
src/src/daemon.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/daemon.c,v 1.1
1 2005/06/21 14:14:55
ph10 Exp $ */
+/* $Cambridge: exim/src/src/daemon.c,v 1.1
3 2005/06/27 14:29:43
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-419,7
+419,7
@@
if (pid == 0)
extensive comment before the reception loop in exim.c for a fuller
explanation of this logic. */
extensive comment before the reception loop in exim.c for a fuller
explanation of this logic. */
- for (i = 0; i < listen_socket_count; i++) close(listen_sockets[i]);
+ for (i = 0; i < listen_socket_count; i++)
(void)
close(listen_sockets[i]);
#ifdef SA_NOCLDWAIT
act.sa_handler = SIG_IGN;
#ifdef SA_NOCLDWAIT
act.sa_handler = SIG_IGN;
@@
-603,8
+603,8
@@
if (pid == 0)
if ((dpid = fork()) == 0)
{
if ((dpid = fork()) == 0)
{
- fclose(smtp_in);
- fclose(smtp_out);
+
(void)
fclose(smtp_in);
+
(void)
fclose(smtp_out);
/* Don't ever molest the parent's SSL connection, but do clean up
the data structures if necessary. */
/* Don't ever molest the parent's SSL connection, but do clean up
the data structures if necessary. */
@@
-691,7
+691,7
@@
if (smtp_out != NULL)
strerror(errno));
smtp_out = NULL;
}
strerror(errno));
smtp_out = NULL;
}
-else close(accept_socket);
+else
(void)
close(accept_socket);
if (smtp_in != NULL)
{
if (smtp_in != NULL)
{
@@
-700,7
+700,7
@@
if (smtp_in != NULL)
strerror(errno));
smtp_in = NULL;
}
strerror(errno));
smtp_in = NULL;
}
-else close(dup_accept_socket);
+else
(void)
close(dup_accept_socket);
/* Release any store used in this process, including the store used for holding
the incoming host address and an expanded active_hostname. */
/* Release any store used in this process, including the store used for holding
the incoming host address and an expanded active_hostname. */
@@
-1208,9
+1208,9
@@
if (background_daemon)
{
log_close_all(); /* Just in case anything was logged earlier */
search_tidyup(); /* Just in case any were used in reading the config. */
{
log_close_all(); /* Just in case anything was logged earlier */
search_tidyup(); /* Just in case any were used in reading the config. */
- close(0); /* Get rid of stdin/stdout/stderr */
- close(1);
- close(2);
+
(void)
close(0); /* Get rid of stdin/stdout/stderr */
+
(void)
close(1);
+
(void)
close(2);
exim_nullstd(); /* Connect stdin/stdout/stderr to /dev/null */
log_stderr = NULL; /* So no attempt to copy paniclog output */
exim_nullstd(); /* Connect stdin/stdout/stderr to /dev/null */
log_stderr = NULL; /* So no attempt to copy paniclog output */
@@
-1320,7
+1320,7
@@
if (daemon_listen)
{
DEBUG(D_any) debug_printf("wildcard IPv4 bind() failed after IPv6 "
"listen() success; EADDRINUSE ignored\n");
{
DEBUG(D_any) debug_printf("wildcard IPv4 bind() failed after IPv6 "
"listen() success; EADDRINUSE ignored\n");
- close(listen_sockets[sk]);
+
(void)
close(listen_sockets[sk]);
goto SKIP_SOCKET;
}
msg = US strerror(errno);
goto SKIP_SOCKET;
}
msg = US strerror(errno);
@@
-1366,7
+1366,7
@@
if (daemon_listen)
DEBUG(D_any) debug_printf("wildcard IPv4 listen() failed after IPv6 "
"listen() success; EADDRINUSE ignored\n");
DEBUG(D_any) debug_printf("wildcard IPv4 listen() failed after IPv6 "
"listen() success; EADDRINUSE ignored\n");
- close(listen_sockets[sk]);
+
(void)
close(listen_sockets[sk]);
/* Come here if there has been a problem with the socket which we
are going to ignore. We remove the address from the chain, and back up the
/* Come here if there has been a problem with the socket which we
are going to ignore. We remove the address from the chain, and back up the
@@
-1417,9
+1417,9
@@
if (running_in_test_harness || write_pid)
f = Ufopen(pid_file_path, "wb");
if (f != NULL)
{
f = Ufopen(pid_file_path, "wb");
if (f != NULL)
{
- fprintf(f, "%d\n", (int)getpid());
- fchmod(fileno(f), 0644);
- fclose(f);
+
(void)
fprintf(f, "%d\n", (int)getpid());
+
(void)
fchmod(fileno(f), 0644);
+
(void)
fclose(f);
DEBUG(D_any) debug_printf("pid written to %s\n", pid_file_path);
}
else
DEBUG(D_any) debug_printf("pid written to %s\n", pid_file_path);
}
else
@@
-1613,7
+1613,8
@@
for (;;)
/* Close any open listening sockets in the child */
/* Close any open listening sockets in the child */
- for (sk = 0; sk < listen_socket_count; sk++) close(listen_sockets[sk]);
+ for (sk = 0; sk < listen_socket_count; sk++)
+ (void)close(listen_sockets[sk]);
/* Reset SIGHUP and SIGCHLD in the child in both cases. */
/* Reset SIGHUP and SIGCHLD in the child in both cases. */
@@
-1857,7
+1858,8
@@
for (;;)
int sk;
log_write(0, LOG_MAIN, "pid %d: SIGHUP received: re-exec daemon",
getpid());
int sk;
log_write(0, LOG_MAIN, "pid %d: SIGHUP received: re-exec daemon",
getpid());
- for (sk = 0; sk < listen_socket_count; sk++) close(listen_sockets[sk]);
+ for (sk = 0; sk < listen_socket_count; sk++)
+ (void)close(listen_sockets[sk]);
alarm(0);
signal(SIGHUP, SIG_IGN);
sighup_argv[0] = exim_path;
alarm(0);
signal(SIGHUP, SIG_IGN);
sighup_argv[0] = exim_path;