summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2020-04-26 21:40:43 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2020-04-26 21:40:43 +0100
commitf07babc0c0abfe8328da451f91f3ea46df3e63d9 (patch)
tree3fdf213bbe105a7afa2472991c0a5ce8b474dd16
parent26831938fd6653134941738b5b048c5cf20ca070 (diff)
tidying
-rw-r--r--src/src/daemon.c2
-rw-r--r--src/src/expand.c10
2 files changed, 2 insertions, 10 deletions
diff --git a/src/src/daemon.c b/src/src/daemon.c
index f011b2b84..cb0d4af09 100644
--- a/src/src/daemon.c
+++ b/src/src/daemon.c
@@ -373,7 +373,6 @@ pid = exim_fork(US"daemon-accept");
if (pid == 0)
{
- int i;
int queue_only_reason = 0;
int old_pool = store_pool;
int save_debug_selector = debug_selector;
@@ -1085,7 +1084,6 @@ struct msghdr msg = { .msg_name = &sa_un,
.msg_controllen = sizeof(cbuf)
};
ssize_t sz;
-struct cmsghdr * cp;
buf[sizeof(buf)-1] = 0;
if ((sz = recvmsg(daemon_notifier_fd, &msg, 0)) <= 0) return FALSE;
diff --git a/src/src/expand.c b/src/src/expand.c
index 500b73916..6d43774f1 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -2438,6 +2438,7 @@ else
+#ifdef EXPERIMENTAL_SRS_NATIVE
/* Do an hmac_md5. The result is _not_ nul-terminated, and is sized as
the smaller of a full hmac_md5 result (16 bytes) or the supplied output buffer.
@@ -2512,6 +2513,7 @@ for (int i = 0, j = len; i < MD5_HASHLEN; i++)
}
return;
}
+#endif /*EXPERIMENTAL_SRS_NATIVE*/
/*************************************************
@@ -5276,16 +5278,8 @@ while (*s != 0)
case EITEM_READSOCK:
{
- client_conn_ctx cctx;
- int timeout = 5;
- int save_ptr = gstring_length(yield);
- FILE * fp = NULL;
uschar * arg;
uschar * sub_arg[4];
- uschar * server_name = NULL;
- host_item host;
- BOOL do_shutdown = TRUE;
- BOOL do_tls = FALSE; /* Only set under ! DISABLE_TLS */
if (expand_forbid & RDO_READSOCK)
{