aboutsummaryrefslogtreecommitdiffstats
path: root/smtpd/mfa.c
diff options
context:
space:
mode:
Diffstat (limited to 'smtpd/mfa.c')
-rw-r--r--smtpd/mfa.c25
1 files changed, 14 insertions, 11 deletions
diff --git a/smtpd/mfa.c b/smtpd/mfa.c
index 297a06b5..e42cdc7e 100644
--- a/smtpd/mfa.c
+++ b/smtpd/mfa.c
@@ -118,13 +118,15 @@ mfa_imsg(struct imsgev *iev, struct imsg *imsg)
return;
case IMSG_CONF_FILTER:
- filter = xmemdup(imsg->data, sizeof *filter, "mfa_imsg");
+ filter = xmemdup(imsg->data, sizeof *filter,
+ "mfa_imsg");
TAILQ_INSERT_TAIL(env->sc_filters, filter, f_entry);
return;
case IMSG_CONF_END:
TAILQ_FOREACH(filter, env->sc_filters, f_entry) {
- log_info("info: Forking filter: %s", filter->name);
+ log_info("info: Forking filter: %s",
+ filter->name);
if (! mfa_fork_filter(filter))
fatalx("could not fork filter");
}
@@ -302,7 +304,8 @@ mfa_test_mail(struct envelope *e)
/*
* "MAIL FROM:<>" is the exception we allow.
*/
- if (!(ss.u.maddr.user[0] == '\0' && ss.u.maddr.domain[0] == '\0'))
+ if (!(ss.u.maddr.user[0] == '\0' &&
+ ss.u.maddr.domain[0] == '\0'))
goto refuse;
}
@@ -310,8 +313,8 @@ mfa_test_mail(struct envelope *e)
return;
refuse:
- imsg_compose_event(env->sc_ievs[PROC_SMTP], IMSG_MFA_MAIL, 0, 0, -1, &ss,
- sizeof(ss));
+ imsg_compose_event(env->sc_ievs[PROC_SMTP], IMSG_MFA_MAIL, 0, 0, -1,
+ &ss, sizeof(ss));
return;
}
@@ -333,7 +336,7 @@ mfa_test_rcpt(struct envelope *e)
ss.flags = e->flags;
mfa_strip_source_route(ss.u.maddr.user, sizeof(ss.u.maddr.user));
-
+
if (! valid_localpart(ss.u.maddr.user) ||
! valid_domainpart(ss.u.maddr.domain))
goto refuse;
@@ -342,16 +345,16 @@ mfa_test_rcpt(struct envelope *e)
return;
refuse:
- imsg_compose_event(env->sc_ievs[PROC_SMTP], IMSG_MFA_RCPT, 0, 0, -1, &ss,
- sizeof(ss));
+ imsg_compose_event(env->sc_ievs[PROC_SMTP], IMSG_MFA_RCPT, 0, 0, -1,
+ &ss, sizeof(ss));
}
static void
mfa_test_rcpt_resume(struct submit_status *ss)
{
if (ss->code != 250) {
- imsg_compose_event(env->sc_ievs[PROC_SMTP], IMSG_MFA_RCPT, 0, 0, -1, ss,
- sizeof(*ss));
+ imsg_compose_event(env->sc_ievs[PROC_SMTP], IMSG_MFA_RCPT, 0, 0,
+ -1, ss, sizeof(*ss));
return;
}
@@ -442,7 +445,7 @@ mfa_fork_filter(struct filter *filter)
if (pid == 0) {
/* filter */
dup2(sockpair[0], STDIN_FILENO);
-
+
closefrom(STDERR_FILENO + 1);
execl(filter->path, filter->name, NULL);