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
constification
[exim.git]
/
src
/
src
/
routers
/
accept.c
diff --git
a/src/src/routers/accept.c
b/src/src/routers/accept.c
index b3a54e7cb83864be2f3bc779ecd200b30a667acc..8b72bfac159f95d58b5984dae133ecb11a923bcf 100644
(file)
--- a/
src/src/routers/accept.c
+++ b/
src/src/routers/accept.c
@@
-2,8
+2,10
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 2015 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "../exim.h"
#include "../exim.h"
@@
-15,7
+17,7
@@
empty declarations ("undefined" in the Standard) we put in a dummy value. */
optionlist accept_router_options[] = {
empty declarations ("undefined" in the Standard) we put in a dummy value. */
optionlist accept_router_options[] = {
- { "", opt_hidden,
NULL
}
+ { "", opt_hidden,
{NULL}
}
};
/* Size of the options list. An extern variable has to be used so that its
};
/* Size of the options list. An extern variable has to be used so that its
@@
-102,12
+104,9
@@
accept_router_options_block *ob =
(accept_router_options_block *)(rblock->options_block);
*/
int rc;
(accept_router_options_block *)(rblock->options_block);
*/
int rc;
-uschar *errors_to;
-uschar *remove_headers;
-header_line *extra_headers;
-
-addr_new = addr_new; /* Keep picky compilers happy */
-addr_succeed = addr_succeed;
+const uschar * errors_to;
+uschar * remove_headers;
+header_line * extra_headers;
DEBUG(D_route) debug_printf("%s router called for %s\n domain = %s\n",
rblock->name, addr->address, addr->domain);
DEBUG(D_route) debug_printf("%s router called for %s\n domain = %s\n",
rblock->name, addr->address, addr->domain);
@@
-117,7
+116,7
@@
DEBUG(D_route) debug_printf("%s router called for %s\n domain = %s\n",
rc = rf_get_errors_address(addr, rblock, verify, &errors_to);
if (rc != OK) return rc;
rc = rf_get_errors_address(addr, rblock, verify, &errors_to);
if (rc != OK) return rc;
-/* Set up the additional and remov
e
able headers for the address. */
+/* Set up the additional and removable headers for the address. */
rc = rf_get_munge_headers(addr, rblock, &extra_headers, &remove_headers);
if (rc != OK) return rc;
rc = rf_get_munge_headers(addr, rblock, &extra_headers, &remove_headers);
if (rc != OK) return rc;