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
Copyright year updates (things touched in 2016)
[exim.git]
/
src
/
src
/
routers
/
queryprogram.c
diff --git
a/src/src/routers/queryprogram.c
b/src/src/routers/queryprogram.c
index 3ae577ba8255d807f7b39d3e2038733ee8b5545b..bfcaefcfd88111a371cf23c06c72e7dc028b50b1 100644
(file)
--- a/
src/src/routers/queryprogram.c
+++ b/
src/src/routers/queryprogram.c
@@
-1,10
+1,8
@@
-/* $Cambridge: exim/src/src/routers/queryprogram.c,v 1.11 2008/12/18 13:13:54 michael Exp $ */
-
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 20
07
*/
+/* Copyright (c) University of Cambridge 1995 - 20
16
*/
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
@@
-116,7
+114,7
@@
while (generated != NULL)
next->parent = addr;
orflag(next, addr, af_propagate);
next->parent = addr;
orflag(next, addr, af_propagate);
- next->p = *addr_prop;
+ next->p
rop
= *addr_prop;
next->start_router = rblock->redirect_router;
next->next = *addr_new;
next->start_router = rblock->redirect_router;
next->next = *addr_new;
@@
-194,7
+192,7
@@
int fd_in, fd_out, len, rc;
pid_t pid;
struct passwd *upw = NULL;
uschar buffer[1024];
pid_t pid;
struct passwd *upw = NULL;
uschar buffer[1024];
-uschar **argvptr;
+
const
uschar **argvptr;
uschar *rword, *rdata, *s;
address_item_propagated addr_prop;
queryprogram_router_options_block *ob =
uschar *rword, *rdata, *s;
address_item_propagated addr_prop;
queryprogram_router_options_block *ob =
@@
-216,15
+214,20
@@
ugid.uid_set = ugid.gid_set = FALSE;
/* Set up the propagated data block with the current address_data and the
errors address and extra header stuff. */
/* Set up the propagated data block with the current address_data and the
errors address and extra header stuff. */
+bzero(&addr_prop, sizeof(addr_prop));
addr_prop.address_data = deliver_address_data;
addr_prop.address_data = deliver_address_data;
-rc = rf_get_errors_address(addr, rblock, verify, &
(addr_prop.errors_address)
);
+rc = rf_get_errors_address(addr, rblock, verify, &
addr_prop.errors_address
);
if (rc != OK) return rc;
if (rc != OK) return rc;
-rc = rf_get_munge_headers(addr, rblock, &
(addr_prop.extra_headers)
,
- &
(addr_prop.remove_headers)
);
+rc = rf_get_munge_headers(addr, rblock, &
addr_prop.extra_headers
,
+ &
addr_prop.remove_headers
);
if (rc != OK) return rc;
if (rc != OK) return rc;
+#ifdef EXPERIMENTAL_SRS
+addr_prop.srs_sender = NULL;
+#endif
+
/* Get the fixed or expanded uid under which the command is to run
(initialization ensures that one or the other is set). */
/* Get the fixed or expanded uid under which the command is to run
(initialization ensures that one or the other is set). */
@@
-528,7
+531,7
@@
lookup_value = NULL;
/* Put the errors address, extra headers, and address_data into this address */
/* Put the errors address, extra headers, and address_data into this address */
-addr->p = addr_prop;
+addr->p
rop
= addr_prop;
/* Queue the address for local or remote delivery. */
/* Queue the address for local or remote delivery. */