*************************************************/
/* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
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,
- (void *)(offsetof(manualroute_router_options_block, host_find_failed)) },
+ OPT_OFF(manualroute_router_options_block, host_find_failed) },
{ "hosts_randomize", opt_bool,
- (void *)(offsetof(manualroute_router_options_block, hosts_randomize)) },
+ OPT_OFF(manualroute_router_options_block, hosts_randomize) },
{ "route_data", opt_stringptr,
- (void *)(offsetof(manualroute_router_options_block, route_data)) },
+ OPT_OFF(manualroute_router_options_block, route_data) },
{ "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,
- (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
{
manualroute_router_options_block *ob =
(manualroute_router_options_block *)(rblock->options_block);
-int i;
/* Host_find_failed must be a recognized word */
-for (i = 0; i < hff_count; i++)
- {
+for (int i = 0; i < hff_count; i++)
if (Ustrcmp(ob->host_find_failed, hff_names[i]) == 0)
{
ob->hff_code = hff_codes[i];
break;
}
- }
if (ob->hff_code < 0)
log_write(0, LOG_PANIC_DIE|LOG_CONFIG_FOR, "%s router:\n "
"unrecognized setting for host_find_failed option", rblock->name);
-for (i = 1; i < hff_count; i++) /* NB starts at 1 to skip "ignore" */
- {
+for (int i = 1; i < hff_count; i++) /* NB starts at 1 to skip "ignore" */
if (Ustrcmp(ob->host_all_ignored, hff_names[i]) == 0)
{
ob->hai_code = hff_codes[i];
break;
}
- }
if (ob->hai_code < 0)
log_write(0, LOG_PANIC_DIE|LOG_CONFIG_FOR, "%s router:\n "
"unrecognized setting for host_all_ignored option", rblock->name);
rc = rf_get_errors_address(addr, rblock, verify, &addr->prop.errors_address);
if (rc != OK) return rc;
-/* Set up the additional and removeable headers for this address. */
+/* Set up the additional and removable headers for this address. */
rc = rf_get_munge_headers(addr, rblock, &addr->prop.extra_headers,
&addr->prop.remove_headers);
if (hostlist[0])
{
host_item *h;
- addr->host_list = h = store_get(sizeof(host_item));
+ addr->host_list = h = store_get(sizeof(host_item), FALSE);
h->name = string_copy(hostlist);
h->address = NULL;
h->port = PORT_NONE;