git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tidying
[exim.git]
/
src
/
src
/
smtp_in.c
diff --git
a/src/src/smtp_in.c
b/src/src/smtp_in.c
index bf7a308db098da4da790e0fc888623c5f015ddc9..dea776dcc55bfca8007cf7dee3e3bd4dcf430be9 100644
(file)
--- a/
src/src/smtp_in.c
+++ b/
src/src/smtp_in.c
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 201
7
*/
+/* Copyright (c) University of Cambridge 1995 - 201
8
*/
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for handling an incoming SMTP call. */
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for handling an incoming SMTP call. */
@@
-1838,7
+1838,7
@@
BOOL yield = helo_accept_junk;
/* Discard any previous helo name */
/* Discard any previous helo name */
-if (sender_helo_name
!= NULL
)
+if (sender_helo_name)
{
store_free(sender_helo_name);
sender_helo_name = NULL;
{
store_free(sender_helo_name);
sender_helo_name = NULL;
@@
-2007,7
+2007,7
@@
deliver_host = deliver_host_address = NULL; /* Can be set by ACL */
#ifndef DISABLE_PRDR
prdr_requested = FALSE;
#endif
#ifndef DISABLE_PRDR
prdr_requested = FALSE;
#endif
-#ifdef
EXPERIMENTAL
_SPF
+#ifdef
SUPPORT
_SPF
spf_header_comment = NULL;
spf_received = NULL;
spf_result = NULL;
spf_header_comment = NULL;
spf_received = NULL;
spf_result = NULL;
@@
-3134,7
+3134,7
@@
return;
/* This function is called when acl_check() fails. As well as calls from within
this module, it is called from receive.c for an ACL after DATA. It sorts out
/* This function is called when acl_check() fails. As well as calls from within
this module, it is called from receive.c for an ACL after DATA. It sorts out
-logging the incident, and se
ts up
the error response. A message containing
+logging the incident, and se
nds
the error response. A message containing
newlines is turned into a multiline SMTP response, but for logging, only the
first line is used.
newlines is turned into a multiline SMTP response, but for logging, only the
first line is used.
@@
-3522,7
+3522,7
@@
else
HDEBUG(D_receive) debug_printf("getting IP address for %s\n",
sender_helo_name);
HDEBUG(D_receive) debug_printf("getting IP address for %s\n",
sender_helo_name);
- rc = host_find_bydns(&h, NULL, HOST_FIND_BY_A,
+ rc = host_find_bydns(&h, NULL, HOST_FIND_BY_A
| HOST_FIND_BY_AAAA
,
NULL, NULL, NULL, &d, NULL, NULL);
if (rc == HOST_FOUND || rc == HOST_FOUND_LOCAL)
for (hh = &h; hh; hh = hh->next)
NULL, NULL, NULL, &d, NULL, NULL);
if (rc == HOST_FOUND || rc == HOST_FOUND_LOCAL)
for (hh = &h; hh; hh = hh->next)
@@
-4040,9
+4040,9
@@
while (done <= 0)
/* Force a reverse lookup if HELO quoted something in helo_lookup_domains
because otherwise the log can be confusing. */
/* Force a reverse lookup if HELO quoted something in helo_lookup_domains
because otherwise the log can be confusing. */
- if (
sender_host_name == NULL &&
-
(deliver_domain = sender_helo_name, /* set $domain */
- match_isinlist(sender_helo_name, CUSS &helo_lookup_domains, 0,
+ if (
!sender_host_name
+
&&
(deliver_domain = sender_helo_name, /* set $domain */
+
match_isinlist(sender_helo_name, CUSS &helo_lookup_domains, 0,
&domainlist_anchor, NULL, MCL_DOMAIN, TRUE, NULL)) == OK)
(void)host_name_lookup();
&domainlist_anchor, NULL, MCL_DOMAIN, TRUE, NULL)) == OK)
(void)host_name_lookup();
@@
-4082,7
+4082,7
@@
while (done <= 0)
}
}
}
}
-#ifdef
EXPERIMENTAL
_SPF
+#ifdef
SUPPORT
_SPF
/* set up SPF context */
spf_init(sender_helo_name, sender_host_address);
#endif
/* set up SPF context */
spf_init(sender_helo_name, sender_host_address);
#endif
@@
-5336,7
+5336,7
@@
while (done <= 0)
cmd_list[CMD_LIST_EHLO].is_mail_cmd = TRUE;
cmd_list[CMD_LIST_AUTH].is_mail_cmd = TRUE;
cmd_list[CMD_LIST_TLS_AUTH].is_mail_cmd = TRUE;
cmd_list[CMD_LIST_EHLO].is_mail_cmd = TRUE;
cmd_list[CMD_LIST_AUTH].is_mail_cmd = TRUE;
cmd_list[CMD_LIST_TLS_AUTH].is_mail_cmd = TRUE;
- if (sender_helo_name
!= NULL
)
+ if (sender_helo_name)
{
store_free(sender_helo_name);
sender_helo_name = NULL;
{
store_free(sender_helo_name);
sender_helo_name = NULL;
@@
-5497,7
+5497,7
@@
while (done <= 0)
case ETRN_CMD:
HAD(SCH_ETRN);
case ETRN_CMD:
HAD(SCH_ETRN);
- if (sender_address
!= NULL
)
+ if (sender_address)
{
done = synprot_error(L_smtp_protocol_error, 503, NULL,
US"ETRN is not permitted inside a transaction");
{
done = synprot_error(L_smtp_protocol_error, 503, NULL,
US"ETRN is not permitted inside a transaction");
@@
-5523,7
+5523,7
@@
while (done <= 0)
since that is strictly the only kind of ETRN that can be implemented
according to the RFC. */
since that is strictly the only kind of ETRN that can be implemented
according to the RFC. */
- if (smtp_etrn_command
!= NULL
)
+ if (smtp_etrn_command)
{
uschar *error;
BOOL rc;
{
uschar *error;
BOOL rc;