{ "dccifd_address", opt_stringptr, &dccifd_address },
{ "dccifd_options", opt_stringptr, &dccifd_options },
#endif
+ { "debug_store", opt_bool, &debug_store },
{ "delay_warning", opt_timelist, &delay_warning },
{ "delay_warning_condition", opt_stringptr, &delay_warning_condition },
{ "deliver_drop_privilege", opt_bool, &deliver_drop_privilege },
{ "dns_retry", opt_int, &dns_retry },
{ "dns_trust_aa", opt_stringptr, &dns_trust_aa },
{ "dns_use_edns0", opt_int, &dns_use_edns0 },
- /* This option is now a no-op, retained for compability */
+ /* This option is now a no-op, retained for compatibility */
{ "drop_cr", opt_bool, &drop_cr },
/*********************************************************/
{ "dsn_advertise_hosts", opt_stringptr, &dsn_advertise_hosts },
#ifdef TRANSPORT_APPENDFILE
# ifdef SUPPORT_MAILDIR
- macro_create(US"_HAVE_TRANSPORT_APPEND_MAILDR", US"y", FALSE, TRUE);
+ macro_create(US"_HAVE_TRANSPORT_APPEND_MAILDIR", US"y", FALSE, TRUE);
# endif
# ifdef SUPPORT_MAILSTORE
macro_create(US"_HAVE_TRANSPORT_APPEND_MAILSTORE", US"y", FALSE, TRUE);
macros that have substrings are always discovered first during
expansion. */
-for (i = 0; i < nopt; i++) if (*(s = opts[i].name) && *s != '*')
+for (i = 0; i < nopt; i++) if (*(s = US opts[i].name) && *s != '*')
if (group)
macro_create(string_sprintf("_OPT_%T_%T_%T", section, group, s), US"y", FALSE, TRUE);
else
"configuration file %s", ss);
config_filename = string_copy(ss);
- config_directory = string_copyn(ss, (const uschar*) strrchr(ss, '/') - ss);
+ config_directory = string_copyn(ss, CUstrrchr(ss, '/') - ss);
config_lineno = 0;
continue;
}
/* We get a coverity error here for using count, as it derived
from the tainted buffer pointed to by s, as parsed by sscanf().
- By the definition of sscanf we must be aceessing between start
+ By the definition of sscanf we must be accessing between start
and end of s (assuming it is nul-terminated...) so ignore the error. */
/* coverity[tainted_data] */
if (s[count] == '.')
exim_setugid(exim_uid, exim_gid, FALSE,
US"calling tls_validate_require_cipher");
- errmsg = tls_validate_require_cipher();
- if (errmsg)
- {
+ if ((errmsg = tls_validate_require_cipher()))
log_write(0, LOG_PANIC_DIE|LOG_CONFIG,
"tls_require_ciphers invalid: %s", errmsg);
- }
fflush(NULL);
_exit(0);
}
{
/* relative configuration file name: working dir + / + basename(filename) */
- char buf[PATH_MAX];
+ uschar buf[PATH_MAX];
int offset = 0;
int size = 0;
- if (getcwd(buf, PATH_MAX) == NULL)
+ if (os_getcwd(buf, PATH_MAX) == NULL)
{
perror("exim: getcwd");
exit(EXIT_FAILURE);