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
/
readconf.c
diff --git
a/src/src/readconf.c
b/src/src/readconf.c
index 7d48f085df33084759b94e1f192b00df8c1ec6a8..bbcca87f7009312a0e55c30b4ce71feff36f9824 100644
(file)
--- a/
src/src/readconf.c
+++ b/
src/src/readconf.c
@@
-2,7
+2,7
@@
* 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. */
/* SPDX-License-Identifier: GPL-2.0-or-later */
/* 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 */
@@
-2741,7
+2741,7
@@
Returns: Boolean success
*/
BOOL
*/
BOOL
-readconf_print(const uschar *
name, uschar *
type, BOOL no_labels)
+readconf_print(const uschar *
name, const uschar *
type, BOOL no_labels)
{
BOOL names_only = FALSE;
optionlist *ol2 = NULL;
{
BOOL names_only = FALSE;
optionlist *ol2 = NULL;
@@
-2915,7
+2915,7
@@
else if (Ustrcmp(type, "macro") == 0)
for printing. So we have an admin_users restriction. */
if (!f.admin_user)
{
for printing. So we have an admin_users restriction. */
if (!f.admin_user)
{
- fprintf(stderr, "exim: permission denied\n");
+ fprintf(stderr, "exim: permission denied
; not admin
\n");
return FALSE;
}
for (macro_item * m = macros; m; m = m->next)
return FALSE;
}
for (macro_item * m = macros; m; m = m->next)
@@
-3121,8
+3121,8
@@
readconf_main(BOOL nowarn)
{
int sep = 0;
struct stat statbuf;
{
int sep = 0;
struct stat statbuf;
-uschar *
s, *
filename;
-const uschar *list = config_main_filelist;
+uschar *
s, *
filename;
+const uschar *
list = config_main_filelist;
/* Loop through the possible file names */
/* Loop through the possible file names */
@@
-3459,7
+3459,7
@@
leading "log_". */
if (syslog_facility_str)
{
int i;
if (syslog_facility_str)
{
int i;
- uschar *s = syslog_facility_str;
+ uschar *
s = syslog_facility_str;
if ((Ustrlen(syslog_facility_str) >= 4) &&
(strncmpic(syslog_facility_str, US"log_", 4) == 0))
if ((Ustrlen(syslog_facility_str) >= 4) &&
(strncmpic(syslog_facility_str, US"log_", 4) == 0))
@@
-3481,10
+3481,11
@@
if (syslog_facility_str)
if (*pid_file_path)
{
if (*pid_file_path)
{
- if (!(s = expand_string(pid_file_path)))
+ const uschar * t = expand_cstring(pid_file_path);
+ if (!t)
log_write(0, LOG_MAIN|LOG_PANIC_DIE, "failed to expand pid_file_path "
"\"%s\": %s", pid_file_path, expand_string_message);
log_write(0, LOG_MAIN|LOG_PANIC_DIE, "failed to expand pid_file_path "
"\"%s\": %s", pid_file_path, expand_string_message);
- pid_file_path =
s
;
+ pid_file_path =
t
;
}
/* Set default value of process_log_path */
}
/* Set default value of process_log_path */