HCoop
/
hcoop
/
debian
/
exim4.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'debian' into hcoop_489
[hcoop/debian/exim4.git]
/
src
/
routers
/
rf_change_domain.c
diff --git
a/src/routers/rf_change_domain.c
b/src/routers/rf_change_domain.c
index
2343e3e
..
219e283
100644
(file)
--- a/
src/routers/rf_change_domain.c
+++ b/
src/routers/rf_change_domain.c
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 20
09
*/
+/* Copyright (c) University of Cambridge 1995 - 20
15
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-32,7
+32,7
@@
Returns: nothing
*/
void
*/
void
-rf_change_domain(address_item *addr, uschar *domain, BOOL rewrite,
+rf_change_domain(address_item *addr,
const
uschar *domain, BOOL rewrite,
address_item **addr_new)
{
address_item *parent = store_get(sizeof(address_item));
address_item **addr_new)
{
address_item *parent = store_get(sizeof(address_item));
@@
-52,11
+52,12
@@
domain cache. Then copy over the propagating fields from the parent. Then set
up the new fields. */
*addr = address_defaults;
up the new fields. */
*addr = address_defaults;
-addr->p
= parent->
p;
+addr->p
rop = parent->pro
p;
addr->address = address;
addr->unique = string_copy(address);
addr->parent = parent;
addr->address = address;
addr->unique = string_copy(address);
addr->parent = parent;
+parent->child_count = 1;
addr->next = *addr_new;
*addr_new = addr;
addr->next = *addr_new;
*addr_new = addr;