*************************************************/
/* Copyright (c) Jeremy Harris 2020 */
+/* Copyright (c) The Exim Maintainers 2021 */
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
internal_readsock_open(client_conn_ctx * cctx, const uschar * sspec,
int timeout, BOOL do_tls, uschar ** errmsg)
{
-int sep = ',';
-uschar * ele;
const uschar * server_name;
host_item host;
sigalrm_seen = FALSE;
ALARM(timeout);
- rc = connect(cctx->sock, (struct sockaddr *)(&sockun), sizeof(sockun));
+ rc = connect(cctx->sock, (struct sockaddr *) &sockun, sizeof(sockun));
ALARM_CLR(0);
if (sigalrm_seen)
{
static void *
readsock_open(const uschar * filename, uschar ** errmsg)
{
-client_conn_ctx * cctx = store_get(sizeof(*cctx), FALSE);
+client_conn_ctx * cctx = store_get(sizeof(*cctx), GET_UNTAINTED);
cctx->sock = -1;
cctx->tls_ctx = NULL;
DEBUG(D_lookup) debug_printf_indent("readsock: allocated context\n");
} lf = {.do_shutdown = TRUE};
uschar * eol = NULL;
int timeout = 5;
-FILE * fp;
gstring * yield;
int ret = DEFER;
and might need later write ops on the socket, the stdio must be in
writable mode or the underlying socket goes non-writable. */
-if (!cctx->tls_ctx)
- fp = fdopen(cctx->sock, lf.do_shutdown ? "rb" : "wb");
-
sigalrm_seen = FALSE;
-ALARM(timeout);
-yield =
-#ifndef DISABLE_TLS
- cctx->tls_ctx ? cat_file_tls(cctx->tls_ctx, NULL, eol) :
+#ifdef DISABLE_TLS
+if (TRUE)
+#else
+if (!cctx->tls_ctx)
#endif
- cat_file(fp, NULL, eol);
+ {
+ FILE * fp = fdopen(cctx->sock, "rb");
+ if (!fp)
+ {
+ log_write(0, LOG_MAIN|LOG_PANIC, "readsock fdopen: %s\n", strerror(errno));
+ goto out;
+ }
+ ALARM(timeout);
+ yield = cat_file(fp, NULL, eol);
+ }
+else
+ {
+ ALARM(timeout);
+ yield = cat_file_tls(cctx->tls_ctx, NULL, eol);
+ }
+
ALARM_CLR(0);
if (sigalrm_seen)