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
Fix cert-try-verify when denied by event action
[exim.git]
/
src
/
src
/
deliver.c
diff --git
a/src/src/deliver.c
b/src/src/deliver.c
index 4462d5c4af9c81f5891ab4169ace2eb571f67c54..27a4344c50ce0aa751c2a8cdb63895018b614381 100644
(file)
--- a/
src/src/deliver.c
+++ b/
src/src/deliver.c
@@
-718,27
+718,27
@@
d_tlslog(uschar * s, int * sizep, int * ptrp, address_item * addr)
-#ifdef EXPERIMENTAL_
TPDA
-int
-
tpda_raise_event
(uschar * action, uschar * event, uschar * ev_data)
+#ifdef EXPERIMENTAL_
EVENT
+uschar *
+
event_raise
(uschar * action, uschar * event, uschar * ev_data)
{
uschar * s;
if (action)
{
DEBUG(D_deliver)
{
uschar * s;
if (action)
{
DEBUG(D_deliver)
- debug_printf("
TPDA(%s): tpda_event_action=|%s| tpda_
delivery_IP=%s\n",
+ debug_printf("
Event(%s): event_action=|%s|
delivery_IP=%s\n",
event,
action, deliver_host_address);
event,
action, deliver_host_address);
-
tpda_event
= event;
-
tpda_data =
ev_data;
+
event_name
= event;
+
event_data =
ev_data;
if (!(s = expand_string(action)) && *expand_string_message)
log_write(0, LOG_MAIN|LOG_PANIC,
if (!(s = expand_string(action)) && *expand_string_message)
log_write(0, LOG_MAIN|LOG_PANIC,
- "failed to expand
tpda_
event_action %s in %s: %s\n",
+ "failed to expand event_action %s in %s: %s\n",
event, transport_name, expand_string_message);
event, transport_name, expand_string_message);
-
tpda_event = tpda
_data = NULL;
+
event_name = event
_data = NULL;
/* If the expansion returns anything but an empty string, flag for
the caller to modify his normal processing
/* If the expansion returns anything but an empty string, flag for
the caller to modify his normal processing
@@
-746,15
+746,15
@@
if (action)
if (s && *s)
{
DEBUG(D_deliver)
if (s && *s)
{
DEBUG(D_deliver)
- debug_printf("
TPDA
(%s): event_action returned \"%s\"\n", event, s);
- return
DEFER
;
+ debug_printf("
Event
(%s): event_action returned \"%s\"\n", event, s);
+ return
s
;
}
}
}
}
-return
OK
;
+return
NULL
;
}
static void
}
static void
-
tpda_msg_event
(uschar * event, address_item * addr)
+
msg_event_raise
(uschar * event, address_item * addr)
{
uschar * save_domain = deliver_domain;
uschar * save_local = deliver_localpart;
{
uschar * save_domain = deliver_domain;
uschar * save_local = deliver_localpart;
@@
-769,7
+769,7
@@
deliver_domain = addr->domain;
deliver_localpart = addr->local_part;
deliver_host = addr->host_used ? addr->host_used->name : NULL;
deliver_localpart = addr->local_part;
deliver_host = addr->host_used ? addr->host_used->name : NULL;
-(void)
tpda_raise_event(addr->transport->tpda_
event_action, event,
+(void)
event_raise(addr->transport->
event_action, event,
addr->host_used || Ustrcmp(addr->transport->driver_name, "lmtp") == 0
? addr->message : NULL);
addr->host_used || Ustrcmp(addr->transport->driver_name, "lmtp") == 0
? addr->message : NULL);
@@
-778,7
+778,7
@@
deliver_localpart = save_local;
deliver_domain = save_domain;
router_name = transport_name = NULL;
}
deliver_domain = save_domain;
router_name = transport_name = NULL;
}
-#endif /*EXPERIMENTAL_
TPDA
*/
+#endif /*EXPERIMENTAL_
EVENT
*/
@@
-803,7
+803,7
@@
the log line, and reset the store afterwards. Remote deliveries should always
have a pointer to the host item that succeeded; local deliveries can have a
pointer to a single host item in their host list, for use by the transport. */
have a pointer to the host item that succeeded; local deliveries can have a
pointer to a single host item in their host list, for use by the transport. */
-#ifdef EXPERIMENTAL_
TPDA
+#ifdef EXPERIMENTAL_
EVENT
/* presume no successful remote delivery */
lookup_dnssec_authenticated = NULL;
#endif
/* presume no successful remote delivery */
lookup_dnssec_authenticated = NULL;
#endif
@@
-870,7
+870,7
@@
else
if (continue_sequence > 1)
s = string_cat(s, &size, &ptr, US"*", 1);
if (continue_sequence > 1)
s = string_cat(s, &size, &ptr, US"*", 1);
-#ifdef EXPERIMENTAL_
TPDA
+#ifdef EXPERIMENTAL_
EVENT
deliver_host_address = addr->host_used->address;
deliver_host_port = addr->host_used->port;
deliver_host = addr->host_used->name;
deliver_host_address = addr->host_used->address;
deliver_host_port = addr->host_used->port;
deliver_host = addr->host_used->name;
@@
-939,8
+939,8
@@
store we used to build the line after writing it. */
s[ptr] = 0;
log_write(0, flags, "%s", s);
s[ptr] = 0;
log_write(0, flags, "%s", s);
-#ifdef EXPERIMENTAL_
TPDA
-if (!msg)
tpda_msg_event
(US"msg:delivery", addr);
+#ifdef EXPERIMENTAL_
EVENT
+if (!msg)
msg_event_raise
(US"msg:delivery", addr);
#endif
store_reset(reset_point);
#endif
store_reset(reset_point);
@@
-1138,7
+1138,7
@@
if (result == OK)
child_done(addr, now);
}
child_done(addr, now);
}
- /* Certificates for logging (via
TPDA
) */
+ /* Certificates for logging (via
events
) */
#ifdef SUPPORT_TLS
tls_out.ourcert = addr->ourcert;
addr->ourcert = NULL;
#ifdef SUPPORT_TLS
tls_out.ourcert = addr->ourcert;
addr->ourcert = NULL;
@@
-1381,8
+1381,8
@@
else
log_write(0, LOG_MAIN, "** %s", s);
log_write(0, LOG_MAIN, "** %s", s);
-#ifdef EXPERIMENTAL_
TPDA
-
tpda_msg_event
(US"msg:fail:delivery", addr);
+#ifdef EXPERIMENTAL_
EVENT
+
msg_event_raise
(US"msg:fail:delivery", addr);
#endif
store_reset(reset_point);
#endif
store_reset(reset_point);
@@
-5585,7
+5585,7
@@
if (process_recipients != RECIP_IGNORE)
break;
}
break;
}
-#ifdef EXPERIMENTAL_
TPDA
+#ifdef EXPERIMENTAL_
EVENT
if (process_recipients != RECIP_ACCEPT)
{
uschar * save_local = deliver_localpart;
if (process_recipients != RECIP_ACCEPT)
{
uschar * save_local = deliver_localpart;
@@
-5596,7
+5596,7
@@
if (process_recipients != RECIP_IGNORE)
deliver_domain = expand_string(
string_sprintf("${domain:%s}", new->address));
deliver_domain = expand_string(
string_sprintf("${domain:%s}", new->address));
- (void)
tpda_raise_event(delivery_
event_action,
+ (void)
event_raise(
event_action,
US"msg:fail:internal", new->message);
deliver_localpart = save_local;
US"msg:fail:internal", new->message);
deliver_localpart = save_local;
@@
-7364,8
+7364,8
@@
if (addr_defer == NULL)
/* Unset deliver_freeze so that we won't try to move the spool files further down */
deliver_freeze = FALSE;
/* Unset deliver_freeze so that we won't try to move the spool files further down */
deliver_freeze = FALSE;
-#ifdef EXPERIMENTAL_
TPDA
- (void)
tpda_raise_event(delivery_
event_action, US"msg:complete", NULL);
+#ifdef EXPERIMENTAL_
EVENT
+ (void)
event_raise(
event_action, US"msg:complete", NULL);
#endif
}
#endif
}