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
TFO: early-data for ClamAV and for readsocket expansion
[exim.git]
/
src
/
src
/
acl.c
diff --git
a/src/src/acl.c
b/src/src/acl.c
index 42292eb82aefad1d5d2ad8e846a65ee50656e7e9..b5ffa0193ed58372ca72918d9d922eaf543f502f 100644
(file)
--- a/
src/src/acl.c
+++ b/
src/src/acl.c
@@
-322,7
+322,7
@@
static condition_def conditions[] = {
(1<<ACL_WHERE_NOTSMTP)|
(1<<ACL_WHERE_NOTSMTP_START),
},
(1<<ACL_WHERE_NOTSMTP)|
(1<<ACL_WHERE_NOTSMTP_START),
},
- [ACLC_SPF_G
EU
SS] = { US"spf_guess", TRUE, FALSE,
+ [ACLC_SPF_G
UE
SS] = { US"spf_guess", TRUE, FALSE,
(1<<ACL_WHERE_AUTH)|(1<<ACL_WHERE_CONNECT)|
(1<<ACL_WHERE_HELO)|
(1<<ACL_WHERE_MAILAUTH)|
(1<<ACL_WHERE_AUTH)|(1<<ACL_WHERE_CONNECT)|
(1<<ACL_WHERE_HELO)|
(1<<ACL_WHERE_MAILAUTH)|
@@
-428,11
+428,11
@@
static control_def controls_list[] = {
#endif
#ifdef EXPERIMENTAL_DMARC
#endif
#ifdef EXPERIMENTAL_DMARC
-[CONTROL_DMARC_
DISABLE_
VERIFY] =
+[CONTROL_DMARC_VERIFY] =
{ US"dmarc_disable_verify", FALSE,
(1<<ACL_WHERE_DATA)|(1<<ACL_WHERE_NOTSMTP)|(1<<ACL_WHERE_NOTSMTP_START)
},
{ US"dmarc_disable_verify", FALSE,
(1<<ACL_WHERE_DATA)|(1<<ACL_WHERE_NOTSMTP)|(1<<ACL_WHERE_NOTSMTP_START)
},
-[CONTROL_
ENABLE
_FORENSIC] =
+[CONTROL_
DMARC
_FORENSIC] =
{ US"dmarc_enable_forensic", FALSE,
(1<<ACL_WHERE_DATA)|(1<<ACL_WHERE_NOTSMTP)|(1<<ACL_WHERE_NOTSMTP_START)
},
{ US"dmarc_enable_forensic", FALSE,
(1<<ACL_WHERE_DATA)|(1<<ACL_WHERE_NOTSMTP)|(1<<ACL_WHERE_NOTSMTP_START)
},
@@
-1140,7
+1140,7
@@
if (log_message != NULL && log_message != user_message)
int length = Ustrlen(text) + 1;
log_write(0, LOG_MAIN, "%s", text);
logged = store_malloc(sizeof(string_item) + length);
int length = Ustrlen(text) + 1;
log_write(0, LOG_MAIN, "%s", text);
logged = store_malloc(sizeof(string_item) + length);
- logged->text =
(uschar *)
logged + sizeof(string_item);
+ logged->text =
US
logged + sizeof(string_item);
memcpy(logged->text, text, length);
logged->next = acl_warn_logged;
acl_warn_logged = logged;
memcpy(logged->text, text, length);
logged->next = acl_warn_logged;
acl_warn_logged = logged;
@@
-1625,13
+1625,13
@@
if (ss == NULL) goto BAD_VERIFY;
/* Handle name/address consistency verification in a separate function. */
for (vp= verify_type_list;
/* Handle name/address consistency verification in a separate function. */
for (vp= verify_type_list;
-
(char *)vp < (char *)
verify_type_list + sizeof(verify_type_list);
+
CS vp < CS
verify_type_list + sizeof(verify_type_list);
vp++
)
if (vp->alt_opt_sep ? strncmpic(ss, vp->name, vp->alt_opt_sep) == 0
: strcmpic (ss, vp->name) == 0)
break;
vp++
)
if (vp->alt_opt_sep ? strncmpic(ss, vp->name, vp->alt_opt_sep) == 0
: strcmpic (ss, vp->name) == 0)
break;
-if (
(char *)vp >= (char *)
verify_type_list + sizeof(verify_type_list))
+if (
CS vp >= CS
verify_type_list + sizeof(verify_type_list))
goto BAD_VERIFY;
if (vp->no_options && slash != NULL)
goto BAD_VERIFY;
if (vp->no_options && slash != NULL)
@@
-2771,8
+2771,9
@@
if (r == HOST_FIND_FAILED || r == HOST_FIND_AGAIN)
HDEBUG(D_acl)
debug_printf_indent("udpsend [%s]:%d %s\n", h->address, portnum, arg);
HDEBUG(D_acl)
debug_printf_indent("udpsend [%s]:%d %s\n", h->address, portnum, arg);
+/*XXX this could better use sendto */
r = s = ip_connectedsocket(SOCK_DGRAM, h->address, portnum, portnum,
r = s = ip_connectedsocket(SOCK_DGRAM, h->address, portnum, portnum,
- 1, NULL, &errstr);
+ 1, NULL, &errstr
, NULL
);
if (r < 0) goto defer;
len = Ustrlen(arg);
r = send(s, arg, len, 0);
if (r < 0) goto defer;
len = Ustrlen(arg);
r = send(s, arg, len, 0);