Add variables for wildcard portion of local-part affix. Bug 281

[exim.git] / src / src / receive.c

diff --git a/src/src/receive.c b/src/src/receive.c
index f30ffd92d68fc613823671e07b54987794fb095c..96a48fe655eb7e3132c1b9787bf907d7fd92d1d8 100644 (file)
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -2907,9 +2907,8 @@ if (  from_header
     uschar *at = domain ? from_address + domain - 1 : NULL;
 
     if (at) *at = 0;
     uschar *at = domain ? from_address + domain - 1 : NULL;
 
     if (at) *at = 0;

-    from_address += route_check_prefix(from_address, local_from_prefix);
-    slen = route_check_suffix(from_address, local_from_suffix);
-    if (slen > 0)
+    from_address += route_check_prefix(from_address, local_from_prefix, NULL);
+    if ((slen = route_check_suffix(from_address, local_from_suffix, NULL)) > 0)

       {
       memmove(from_address+slen, from_address, Ustrlen(from_address)-slen);
       from_address += slen;
       {
       memmove(from_address+slen, from_address, Ustrlen(from_address)-slen);
       from_address += slen;