summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2015-09-14 23:46:55 +0200
committerHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2015-09-14 23:46:55 +0200
commit2f21487fa76ef002f7f8a3565e68460fd046a152 (patch)
tree66cc616f983e06e732463b22f54b2d1f4e1dd348 /src
parent11bb9b0cd4bf56d14309d50a3632256bb4a6fc44 (diff)
Add the Exim version to process info (exiwhat)
Diffstat (limited to 'src')
-rw-r--r--src/src/daemon.c7
-rw-r--r--src/src/exim.c2
2 files changed, 5 insertions, 4 deletions
diff --git a/src/src/daemon.c b/src/src/daemon.c
index e1ff9a16f..65195ccd1 100644
--- a/src/src/daemon.c
+++ b/src/src/daemon.c
@@ -1603,7 +1603,7 @@ if (inetd_wait_mode)
log_write(0, LOG_MAIN,
"exim %s daemon started: pid=%d, launched with listening socket, %s",
version_string, getpid(), big_buffer);
- set_process_info("daemon: pre-listening socket");
+ set_process_info("daemon(%s): pre-listening socket", version_string);
/* set up the timeout logic */
sigalrm_seen = 1;
@@ -1688,7 +1688,7 @@ else if (daemon_listen)
log_write(0, LOG_MAIN,
"exim %s daemon started: pid=%d, %s, listening for %s",
version_string, getpid(), qinfo, big_buffer);
- set_process_info("daemon: %s, listening for %s", qinfo, big_buffer);
+ set_process_info("daemon(%s): %s, listening for %s", version_string, qinfo, big_buffer);
}
else
@@ -1696,7 +1696,8 @@ else
log_write(0, LOG_MAIN,
"exim %s daemon started: pid=%d, -q%s, not listening for SMTP",
version_string, getpid(), readconf_printtime(queue_interval));
- set_process_info("daemon: -q%s, not listening",
+ set_process_info("daemon(%s): -q%s, not listening",
+ version_string,
readconf_printtime(queue_interval));
}
diff --git a/src/src/exim.c b/src/src/exim.c
index 084d64990..ceec9cb2a 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -230,7 +230,7 @@ to disrupt whatever is going on outside the signal handler. */
if (fd < 0) return;
-{int dummy = write(fd, process_info, process_info_len); dummy = dummy; }
+(void)write(fd, process_info, process_info_len);
(void)close(fd);
}