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
Routing: dnslookup and manualroute routers: ipv4_only, ipv4_prefer options. Bug...
[exim.git]
/
src
/
src
/
smtp_in.c
diff --git
a/src/src/smtp_in.c
b/src/src/smtp_in.c
index bf7a308db098da4da790e0fc888623c5f015ddc9..424295dd58994eb24d2bbc62542ea688d6735e58 100644
(file)
--- a/
src/src/smtp_in.c
+++ b/
src/src/smtp_in.c
@@
-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)
@@
-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