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
$local_part_verified
[exim.git]
/
src
/
src
/
acl.c
diff --git
a/src/src/acl.c
b/src/src/acl.c
index 8e34513d0f22aaab950960232e5802153695e12d..7284831a6ef881952d4a1c184329b7d83d6157a7 100644
(file)
--- a/
src/src/acl.c
+++ b/
src/src/acl.c
@@
-866,11
+866,10
@@
while ((s = (*func)()) != NULL)
{
uschar *endptr;
{
uschar *endptr;
- if (Ustrncmp(s, "acl_c", 5) != 0 &&
- Ustrncmp(s, "acl_m", 5) != 0)
+ if (Ustrncmp(s, "acl_c", 5) != 0 && Ustrncmp(s, "acl_m", 5) != 0)
{
*error = string_sprintf("invalid variable name after \"set\" in ACL "
{
*error = string_sprintf("invalid variable name after \"set\" in ACL "
-
"modifier \"set %s\" (must start \"acl_c\" or \"acl_m\")", s);
+ "modifier \"set %s\" (must start \"acl_c\" or \"acl_m\")", s);
return NULL;
}
return NULL;
}
@@
-878,19
+877,19
@@
while ((s = (*func)()) != NULL)
if (!isdigit(*endptr) && *endptr != '_')
{
*error = string_sprintf("invalid variable name after \"set\" in ACL "
if (!isdigit(*endptr) && *endptr != '_')
{
*error = string_sprintf("invalid variable name after \"set\" in ACL "
-
"modifier \"set %s\" (digit or underscore must follow acl_c or acl_m)",
-
s);
+ "modifier \"set %s\" (digit or underscore must follow acl_c or acl_m)",
+ s);
return NULL;
}
return NULL;
}
- while (*endptr
!= 0
&& *endptr != '=' && !isspace(*endptr))
+ while (*endptr && *endptr != '=' && !isspace(*endptr))
{
if (!isalnum(*endptr) && *endptr != '_')
{
if (!isalnum(*endptr) && *endptr != '_')
-
{
-
*error = string_sprintf("invalid character \"%c\" in variable name "
-
"in ACL modifier \"set %s\"", *endptr, s);
-
return NULL;
-
}
+ {
+ *error = string_sprintf("invalid character \"%c\" in variable name "
+ "in ACL modifier \"set %s\"", *endptr, s);
+ return NULL;
+ }
endptr++;
}
endptr++;
}
@@
-1345,8
+1344,7
@@
extension to CSA, so we allow it to be turned off for proper conformance. */
if (string_is_ip_address(domain, NULL) != 0)
{
if (!dns_csa_use_reverse) return CSA_UNKNOWN;
if (string_is_ip_address(domain, NULL) != 0)
{
if (!dns_csa_use_reverse) return CSA_UNKNOWN;
- dns_build_reverse(domain, target);
- domain = target;
+ domain = dns_build_reverse(domain);
}
/* Find out if we've already done the CSA check for this domain. If we have,
}
/* Find out if we've already done the CSA check for this domain. If we have,
@@
-3635,15
+3633,12
@@
for (; cb; cb = cb->next)
sender_address_cache, -1, 0, CUSS &sender_data);
break;
sender_address_cache, -1, 0, CUSS &sender_data);
break;
- /* Connection variables must persist forever */
+ /* Connection variables must persist forever
; message variables not
*/
case ACLC_SET:
{
int old_pool = store_pool;
case ACLC_SET:
{
int old_pool = store_pool;
- if ( cb->u.varname[0] == 'c'
-#ifndef DISABLE_DKIM
- || cb->u.varname[0] == 'd'
-#endif
+ if ( cb->u.varname[0] != 'm'
#ifndef DISABLE_EVENT
|| event_name /* An event is being delivered */
#endif
#ifndef DISABLE_EVENT
|| event_name /* An event is being delivered */
#endif