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
SPDX: license tags (mostly by guesswork)
[exim.git]
/
src
/
src
/
routers
/
manualroute.c
diff --git
a/src/src/routers/manualroute.c
b/src/src/routers/manualroute.c
index f7cca3a429bed7dc8814d834cb3ef3107112c3dc..6a500d09a08967d191a92e8727efb386db72ed14 100644
(file)
--- a/
src/src/routers/manualroute.c
+++ b/
src/src/routers/manualroute.c
@@
-2,8
+2,10
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-only */
#include "../exim.h"
#include "../exim.h"
@@
-15,17
+17,17
@@
optionlist manualroute_router_options[] = {
{ "host_all_ignored", opt_stringptr,
optionlist manualroute_router_options[] = {
{ "host_all_ignored", opt_stringptr,
-
(void *)(offsetof(manualroute_router_options_block, host_all_ignored)
) },
+
OPT_OFF(manualroute_router_options_block, host_all_ignored
) },
{ "host_find_failed", opt_stringptr,
{ "host_find_failed", opt_stringptr,
-
(void *)(offsetof(manualroute_router_options_block, host_find_failed)
) },
+
OPT_OFF(manualroute_router_options_block, host_find_failed
) },
{ "hosts_randomize", opt_bool,
{ "hosts_randomize", opt_bool,
-
(void *)(offsetof(manualroute_router_options_block, hosts_randomize)
) },
+
OPT_OFF(manualroute_router_options_block, hosts_randomize
) },
{ "route_data", opt_stringptr,
{ "route_data", opt_stringptr,
-
(void *)(offsetof(manualroute_router_options_block, route_data)
) },
+
OPT_OFF(manualroute_router_options_block, route_data
) },
{ "route_list", opt_stringptr,
{ "route_list", opt_stringptr,
-
(void *)(offsetof(manualroute_router_options_block, route_list)
) },
+
OPT_OFF(manualroute_router_options_block, route_list
) },
{ "same_domain_copy_routing", opt_bool|opt_public,
{ "same_domain_copy_routing", opt_bool|opt_public,
-
(void *)(offsetof(router_instance, same_domain_copy_routing)
) }
+
OPT_OFF(router_instance, same_domain_copy_routing
) }
};
/* Size of the options list. An extern variable has to be used so that its
};
/* Size of the options list. An extern variable has to be used so that its
@@
-247,9
+249,6
@@
transport_instance *transport = NULL;
BOOL individual_transport_set = FALSE;
BOOL randomize = ob->hosts_randomize;
BOOL individual_transport_set = FALSE;
BOOL randomize = ob->hosts_randomize;
-addr_new = addr_new; /* Keep picky compilers happy */
-addr_succeed = addr_succeed;
-
DEBUG(D_route) debug_printf("%s router called for %s\n domain = %s\n",
rblock->name, addr->address, addr->domain);
DEBUG(D_route) debug_printf("%s router called for %s\n domain = %s\n",
rblock->name, addr->address, addr->domain);
@@
-261,7
+260,7
@@
if (ob->route_list)
int sep = -(';'); /* Default is semicolon */
listptr = ob->route_list;
int sep = -(';'); /* Default is semicolon */
listptr = ob->route_list;
- while ((route_item = string_nextinlist(&listptr, &sep, NULL, 0))
!= NULL
)
+ while ((route_item = string_nextinlist(&listptr, &sep, NULL, 0)))
{
int rc;
{
int rc;
@@
-401,7
+400,7
@@
if (transport && transport->info->local)
if (hostlist[0])
{
host_item *h;
if (hostlist[0])
{
host_item *h;
- addr->host_list = h = store_get(sizeof(host_item));
+ addr->host_list = h = store_get(sizeof(host_item)
, GET_UNTAINTED
);
h->name = string_copy(hostlist);
h->address = NULL;
h->port = PORT_NONE;
h->name = string_copy(hostlist);
h->address = NULL;
h->port = PORT_NONE;
@@
-470,7
+469,7
@@
if (!addr->host_list)
defined for these hosts. It will be a remote one, as a local transport is
dealt with above. However, we don't need one if verifying only. */
defined for these hosts. It will be a remote one, as a local transport is
dealt with above. However, we don't need one if verifying only. */
-if (
transport == NULL
&& verify == v_none)
+if (
!transport
&& verify == v_none)
{
log_write(0, LOG_MAIN, "Error in %s router: no transport defined",
rblock->name);
{
log_write(0, LOG_MAIN, "Error in %s router: no transport defined",
rblock->name);