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
Tidy build for OpenBSD
[exim.git]
/
src
/
src
/
route.c
diff --git
a/src/src/route.c
b/src/src/route.c
index 1764de853d6d8fe50be421207ad48e7cda12c386..1b9676f3f87ffd3aea6017f76b67bea0f2e93a87 100644
(file)
--- a/
src/src/route.c
+++ b/
src/src/route.c
@@
-140,20
+140,31
@@
optionlist optionlist_routers[] = {
(void *)offsetof(router_instance, verify_sender) }
};
(void *)offsetof(router_instance, verify_sender) }
};
-int optionlist_routers_size =
sizeof(optionlist_routers)/sizeof(optionlist
);
+int optionlist_routers_size =
nelem(optionlist_routers
);
+#ifdef MACRO_PREDEF
+
+# include "macro_predef.h"
+
void
void
-
readconf_
options_routers(void)
+options_routers(void)
{
struct router_info * ri;
{
struct router_info * ri;
+uschar buf[64];
-
readconf_options_from_list(optionlist_routers, nelem(optionlist_routers), US"RT"
);
+
options_from_list(optionlist_routers, nelem(optionlist_routers), US"ROUTERS", NULL
);
for (ri = routers_available; ri->driver_name[0]; ri++)
for (ri = routers_available; ri->driver_name[0]; ri++)
- readconf_options_from_list(ri->options, (unsigned)*ri->options_count, ri->driver_name);
+ {
+ spf(buf, sizeof(buf), US"_DRIVER_ROUTER_%T", ri->driver_name);
+ builtin_macro_create(buf);
+ options_from_list(ri->options, (unsigned)*ri->options_count, US"ROUTER", ri->driver_name);
+ }
}
}
+#else /*!MACRO_PREDEF*/
+
/*************************************************
* Set router pointer from name *
*************************************************/
/*************************************************
* Set router pointer from name *
*************************************************/
@@
-711,7
+722,7
@@
while ((check = string_nextinlist(&listptr, &sep, buffer, sizeof(buffer))))
pid = fork();
/* If fork() fails, reinstate the original error and behave as if
pid = fork();
/* If fork() fails, reinstate the original error and behave as if
- this block of code were not present. This is the same behaviou
s
as happens
+ this block of code were not present. This is the same behaviou
r
as happens
when Exim is not running as root at this point. */
if (pid < 0)
when Exim is not running as root at this point. */
if (pid < 0)
@@
-762,7
+773,7
@@
while ((check = string_nextinlist(&listptr, &sep, buffer, sizeof(buffer))))
rc = -1;
}
rc = -1;
}
- /* Handle error returns from stat() or route_check_access(). The EAC
ES
S error
+ /* Handle error returns from stat() or route_check_access(). The EAC
CE
S error
is handled specially. At present, we can force it to be treated as
non-existence. Write the code so that it will be easy to add forcing for
existence if required later. */
is handled specially. At present, we can force it to be treated as
non-existence. Write the code so that it will be easy to add forcing for
existence if required later. */
@@
-963,7
+974,7
@@
if (r->router_home_directory)
}
/* Skip if the sender condition is not met. We leave this one till after the
}
/* Skip if the sender condition is not met. We leave this one till after the
-local user check so that $home is set - enabling the possiblity of letting
+local user check so that $home is set - enabling the possib
i
lity of letting
individual recipients specify lists of acceptable/unacceptable senders. */
if ((rc = route_check_dls(r->name, US"senders", r->senders, NULL,
individual recipients specify lists of acceptable/unacceptable senders. */
if ((rc = route_check_dls(r->name, US"senders", r->senders, NULL,
@@
-1174,7
+1185,7
@@
NIS or NFS whatever cause an incorrect refusal. It's a pity that getgrnam()
doesn't have some kind of indication as to why it has failed.
Arguments:
doesn't have some kind of indication as to why it has failed.
Arguments:
- s the group nam
d
or textual form of the numerical gid
+ s the group nam
e
or textual form of the numerical gid
return_gid return the gid via this address
Returns: TRUE if the group was found; FALSE otherwise
return_gid return the gid via this address
Returns: TRUE if the group was found; FALSE otherwise
@@
-1354,7
+1365,7
@@
new->prop.errors_address = parent->prop.errors_address;
/* Copy the propagated flags and address_data from the original. */
/* Copy the propagated flags and address_data from the original. */
-
copyflag(new, addr, af_propagate)
;
+
new->prop.ignore_error = addr->prop.ignore_error
;
new->prop.address_data = addr->prop.address_data;
new->dsn_flags = addr->dsn_flags;
new->dsn_orcpt = addr->dsn_orcpt;
new->prop.address_data = addr->prop.address_data;
new->dsn_flags = addr->dsn_flags;
new->dsn_orcpt = addr->dsn_orcpt;
@@
-1480,7
+1491,7
@@
for (r = addr->start_router ? addr->start_router : routers; r; r = nextr)
by this router, even if it was different to the current address.
Just in case someone does put it into a loop (possible with redirection
by this router, even if it was different to the current address.
Just in case someone does put it into a loop (possible with redirection
- continally adding to an address, for example), put a long stop counter on
+ contin
u
ally adding to an address, for example), put a long stop counter on
the number of parents. */
for (parent = addr->parent; parent; parent = parent->parent)
the number of parents. */
for (parent = addr->parent; parent; parent = parent->parent)
@@
-1916,4
+1927,5
@@
disable_logging = FALSE;
return yield;
}
return yield;
}
+#endif /*!MACRO_PREDEF*/
/* End of route.c */
/* End of route.c */