X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/6e2b4ccc44cc0e84337b9b74479c347985edab1c..8e669ac162fe3b1040297f1d021de10778dce9d9:/src/src/routers/redirect.c diff --git a/src/src/routers/redirect.c b/src/src/routers/redirect.c index aba5b0d63..90ec9de6a 100644 --- a/src/src/routers/redirect.c +++ b/src/src/routers/redirect.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/routers/redirect.c,v 1.4 2005/01/04 10:00:44 ph10 Exp $ */ +/* $Cambridge: exim/src/src/routers/redirect.c,v 1.5 2005/02/17 11:58:27 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -548,16 +548,16 @@ if (!ugid.gid_set && pw != NULL) if(ob->srs != NULL) { BOOL usesrs = TRUE; - + if(ob->srs_condition != NULL) usesrs = expand_check_condition(ob->srs_condition, "srs_condition expansion failed", NULL); - + if(usesrs) if(Ustrcmp(ob->srs, "reverse") == 0 || Ustrcmp(ob->srs, "reverseandforward") == 0) { uschar *res; int n_srs; - + srs_orig_recipient = addr->address; eximsrs_init(); if(ob->srs_db) @@ -800,17 +800,17 @@ else if(ob->srs != NULL) { BOOL usesrs = TRUE; - + if(ob->srs_condition != NULL) usesrs = expand_check_condition(ob->srs_condition, "srs_condition expansion failed", NULL); - + if(usesrs) if((Ustrcmp(ob->srs, "forward") == 0 || Ustrcmp(ob->srs, "reverseandforward") == 0) && !verify) { uschar *res; uschar *usedomain; int n_srs; - + srs_orig_sender = sender_address; eximsrs_init(); if(ob->srs_db) @@ -818,7 +818,7 @@ else if(ob->srs_alias != NULL ? (usedomain = expand_string(ob->srs_alias)) == NULL : 1) usedomain = deliver_domain; - + if((n_srs = eximsrs_forward(&res, sender_address, usedomain)) != OK) return n_srs; sender_address = res;