Skip to content
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.

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

Systemd #85

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
Prev Previous commit
Revert "Add "AUTH EXTERNAL" option for certificate authentication"
This reverts commit 7f57292.
  • Loading branch information
bigntallmike committed Jul 25, 2022
commit 3da38f95a7df820a1259eb814d0db324309170f6
3 changes: 0 additions & 3 deletions doc/nullmailer-send.8
Original file line number Diff line number Diff line change
@@ -137,9 +137,6 @@ Set the source address for connections to the remote host.
.B auth-login
Force SMTP "AUTH LOGIN" mode instead of auto-detecting.
.TP
.B auth-external
Use SMTP "AUTH EXTERNAL" for TLS client certificate authentication.
.TP
.B tls
Connect using TLS.
This will automatically switch the default port to
2 changes: 0 additions & 2 deletions protocols/protocol.cc
Original file line number Diff line number Diff line change
@@ -55,8 +55,6 @@ cli_option cli_options[] = {
{ 0, "source", cli_option::string, 0, &source,
"Source address for connections", 0 },
#ifdef HAVE_TLS
{ 0, "auth-external", cli_option::flag, AUTH_EXTERNAL, &auth_method,
"Use AUTH EXTERNAL for certificate based authentication", 0 },
{ 0, "tls", cli_option::flag, 1, &use_tls,
"Connect using TLS (on an alternate port by default)", 0 },
{ 0, "ssl", cli_option::flag, 1, &use_tls,
1 change: 0 additions & 1 deletion protocols/protocol.h
Original file line number Diff line number Diff line change
@@ -13,7 +13,6 @@ extern void protocol_succ(const char* msg);
#define AUTH_DETECT 0
#define AUTH_LOGIN 1
#define AUTH_PLAIN 2
#define AUTH_EXTERNAL 3
extern const char* user;
extern const char* pass;
extern int auth_method;
9 changes: 1 addition & 8 deletions protocols/smtp.cc
Original file line number Diff line number Diff line change
@@ -231,14 +231,7 @@ void protocol_send(fdibuf& in, fdibuf& netin, fdobuf& netout)
if (!did_starttls)
conn.docmd("", 200);

if (auth_method == AUTH_EXTERNAL) {
conn.dohelo(true);
if (conn.hascap("AUTH", "EXTERNAL"))
conn.docmd("AUTH EXTERNAL =", 200, ERR_AUTH_FAILED);
else
protocol_fail(ERR_MSG_TEMPFAIL, "Server does not advertise certificate authentication");
}
else if (user != 0 && pass != 0) {
if (user != 0 && pass != 0) {
conn.dohelo(true);
if (auth_method == AUTH_LOGIN)
conn.auth_login();