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

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

diff --git a/src/src/deliver.c b/src/src/deliver.c
index 467813800ff5f3b3e16f5778cf9280fada4a6075..5c5167b3a94f42b5e9139afd2a30be14284a1ec8 100644 (file)
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -220,7 +220,9 @@ if (!addr->next)
 
   deliver_localpart = addr->local_part;
   deliver_localpart_prefix = addr->prefix;
 
   deliver_localpart = addr->local_part;
   deliver_localpart_prefix = addr->prefix;

+  deliver_localpart_prefix_v = addr->prefix_v;

   deliver_localpart_suffix = addr->suffix;
   deliver_localpart_suffix = addr->suffix;

+  deliver_localpart_suffix_v = addr->suffix_v;

 
   for (addr_orig = addr; addr_orig->parent; addr_orig = addr_orig->parent) ;
   deliver_domain_orig = addr_orig->domain;
 
   for (addr_orig = addr; addr_orig->parent; addr_orig = addr_orig->parent) ;
   deliver_domain_orig = addr_orig->domain;


@@ -260,7 +262,9 @@ if (!addr->next)
       else if (deliver_localpart[0] == '|') address_pipe = addr->local_part;
       deliver_localpart = addr->parent->local_part;
       deliver_localpart_prefix = addr->parent->prefix;
       else if (deliver_localpart[0] == '|') address_pipe = addr->local_part;
       deliver_localpart = addr->parent->local_part;
       deliver_localpart_prefix = addr->parent->prefix;

+      deliver_localpart_prefix_v = addr->parent->prefix_v;

       deliver_localpart_suffix = addr->parent->suffix;
       deliver_localpart_suffix = addr->parent->suffix;

+      deliver_localpart_suffix_v = addr->parent->suffix_v;

       }
     }
 
       }
     }