Skip to content

Fix modern TLS #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mikhailnov wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix modern TLS #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fe7292
Fix build with GCC >= 10: declare globals extern in email.h
mikhailnov Sep 11, 2026
55b784c
Abort when the TLS upgrade fails after STARTTLS
mikhailnov Sep 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions include/email.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ struct addr {
typedef enum { GPG_SIG=0x01, GPG_ENC=0x02 } GpgCallType;


/* Globally defined vars */
dhash table;
char *conf_file;
/* Globally defined vars (defined in email.c) */
extern dhash table;
extern char *conf_file;

struct mailer_options {
bool verbose;
Expand All @@ -78,7 +78,9 @@ struct mailer_options {
dlist to;
dlist cc;
dlist bcc;
} Mopts;
};

extern struct mailer_options Mopts;

void usage(void);

Expand Down
5 changes: 5 additions & 0 deletions src/email.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@
#include "error.h"
#include "mimeutils.h"

/* Global variables declared in email.h */
dhash table;
char *conf_file;
struct mailer_options Mopts;

static void
defaultDestr(void *ptr)
{
Expand Down
7 changes: 6 additions & 1 deletion src/processmail.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,12 @@ processRemote(const char *smtp_serv, int smtp_port, dstrbuf *msg)
#endif
if (use_tls && strcasecmp(use_tls, "true") == 0) {
if (smtpStartTls(sd) != ERROR) {
dnetUseTls(sd);
if (dnetUseTls(sd) == ERROR) {
fatal("Could not establish TLS connection: %s\n",
dnetGetErr(sd));
retval = ERROR;
goto end;
}
dnetVerifyCert(sd);
if (smtpInitAfterTLS(sd, nodename) == ERROR) {
printSmtpError();
Expand Down