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
constification
[exim.git]
/
src
/
src
/
route.c
diff --git
a/src/src/route.c
b/src/src/route.c
index 82d51bc68881797cc24fcd5e3af772bc5ae2c2af..0bd87b83729a841bdaad705caabdadb08836148d 100644
(file)
--- a/
src/src/route.c
+++ b/
src/src/route.c
@@
-859,12
+859,12
@@
Returns: OK if all the tests succeed
*/
static BOOL
*/
static BOOL
-check_router_conditions(router_instance *
r, address_item *
addr, int verify,
- struct passwd **
pw, uschar **
perror)
+check_router_conditions(router_instance *
r, address_item *
addr, int verify,
+ struct passwd **
pw, uschar **
perror)
{
int rc;
{
int rc;
-uschar *check_local_part;
-unsigned int *localpart_cache;
+uschar *
check_local_part;
+unsigned int *
localpart_cache;
/* Reset variables to hold a home directory and data from lookup of a domain or
local part, and ensure search_find_defer is unset, in case there aren't any
/* Reset variables to hold a home directory and data from lookup of a domain or
local part, and ensure search_find_defer is unset, in case there aren't any
@@
-928,15
+928,12
@@
because that doesn't have the prefix or suffix stripped. A bit of massaging is
required. Also, we only use the match cache for local parts that have not had
a prefix or suffix stripped. */
required. Also, we only use the match cache for local parts that have not had
a prefix or suffix stripped. */
+check_local_part = string_copy(addr->cc_local_part);
if (!addr->prefix && !addr->suffix)
if (!addr->prefix && !addr->suffix)
- {
localpart_cache = addr->localpart_cache;
localpart_cache = addr->localpart_cache;
- check_local_part = addr->cc_local_part;
- }
else
{
localpart_cache = NULL;
else
{
localpart_cache = NULL;
- check_local_part = string_copy(addr->cc_local_part);
if (addr->prefix)
check_local_part += Ustrlen(addr->prefix);
if (addr->suffix)
if (addr->prefix)
check_local_part += Ustrlen(addr->prefix);
if (addr->suffix)