Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit abfca752 abfca75219cf61603d8befa90e4cf01d5ab5eabf by Sergey Poznyakoff
Options

Use global TLS setting in inetd mode (bug #40891) 

* imap4d/imap4d.c (imap4d_connection): Use global TLS setting if
no local one was supplied.
(main): Use global TLS setting in inetd mode.
* pop3d/pop3d.c (main): Use global TLS setting in inetd mode.
1 parent 27b6965a
Inline Side-by-side
Showing 2 changed files with 4 additions and 3 deletions
......@@ -738,7 +738,8 @@ imap4d_connection (int fd, struct sockaddr *sa, int salen,
else
rc = 1;
imap4d_mainloop (fd, fd, cfg->tls_mode);
imap4d_mainloop (fd, fd,
cfg->tls_mode == tls_unspecified ? tls_mode : cfg->tls_mode);
if (rc == 0)
clr_strerr_flt ();
......@@ -934,7 +935,7 @@ main (int argc, char **argv)
{
/* Make sure we are in the root directory. */
chdir ("/");
status = imap4d_mainloop (MU_STDIN_FD, MU_STDOUT_FD, 0);
status = imap4d_mainloop (MU_STDIN_FD, MU_STDOUT_FD, tls_mode);
}
if (status)
......
......@@ -668,7 +668,7 @@ main (int argc, char **argv)
{
/* Make sure we are in the root directory. */
chdir ("/");
status = pop3d_mainloop (MU_STDIN_FD, MU_STDOUT_FD, tls_no);
status = pop3d_mainloop (MU_STDIN_FD, MU_STDOUT_FD, tls_mode);
}
if (status)
......