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
Build: avoid compiling code for unused transports, routers, authenticators
[exim.git]
/
src
/
src
/
routers
/
queryprogram.c
diff --git
a/src/src/routers/queryprogram.c
b/src/src/routers/queryprogram.c
index 55f03a477ffc03b3ed43cefb041bdeb1dac8b8f0..b1d736f948c1063981b4f64ddc4f97e6b7ca0748 100644
(file)
--- a/
src/src/routers/queryprogram.c
+++ b/
src/src/routers/queryprogram.c
@@
-2,11
+2,14
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) The Exim Maintainers 2020 - 202
2
*/
+/* Copyright (c) The Exim Maintainers 2020 - 202
3
*/
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "../exim.h"
#include "../exim.h"
+
+#ifdef ROUTER_QUERYPROGRAM /* Remainder of file */
#include "rf_functions.h"
#include "queryprogram.h"
#include "rf_functions.h"
#include "queryprogram.h"
@@
-286,12
+289,12
@@
if (curr_uid != root_uid && (uid != curr_uid || gid != curr_gid))
/* Set up the command to run */
/* Set up the command to run */
+GET_OPTION("command");
if (!transport_set_up_command(&argvptr, /* anchor for arg list */
ob->command, /* raw command */
if (!transport_set_up_command(&argvptr, /* anchor for arg list */
ob->command, /* raw command */
- T
RUE, /* expand the arguments
*/
+ T
SUC_EXPAND_ARGS, /* arguments expanded but must not be tainted
*/
0, /* not relevant when... */
NULL, /* no transporting address */
0, /* not relevant when... */
NULL, /* no transporting address */
- FALSE, /* args must be untainted */
US"queryprogram router", /* for error messages */
&addr->message)) /* where to put error message */
return DEFER;
US"queryprogram router", /* for error messages */
&addr->message)) /* where to put error message */
return DEFER;
@@
-534,5
+537,6
@@
addr->prop = addr_prop;
return rf_queue_add(addr, addr_local, addr_remote, rblock, pw) ? OK : DEFER;
}
return rf_queue_add(addr, addr_local, addr_remote, rblock, pw) ? OK : DEFER;
}
-#endif /*!MACRO_PREDEF*/
+#endif /*!MACRO_PREDEF*/
+#endif /*ROUTER_QUERYPROGRAM*/
/* End of routers/queryprogram.c */
/* End of routers/queryprogram.c */