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;
} lf = {.do_shutdown = TRUE};
uschar * eol = NULL;
int timeout = 5;
-FILE * fp;
gstring * yield;
int ret = DEFER;
-DEBUG(D_lookup) debug_printf_indent("readsock: file=\"%s\" key=\"%s\" len=%d opts=\"%s\"\n", filename, keystring, length, opts);
+DEBUG(D_lookup)
+ debug_printf_indent("readsock: file=\"%s\" key=\"%s\" len=%d opts=\"%s\"\n",
+ filename, keystring, length, opts);
/* Parse options */
lf.do_tls = TRUE;
#endif
else if (Ustrncmp(s, "eol=", 4) == 0)
- eol = s + 4;
+ eol = string_unprinting(s + 4);
else if (Ustrcmp(s, "cache=yes") == 0)
lf.cache = TRUE;
else if (Ustrcmp(s, "send=no") == 0)
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, lf.do_shutdown ? "rb" : "wb");
+ 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)