diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2020-07-22 18:18:33 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2020-07-22 18:18:33 +0300 |
commit | f4df8a05b9c015b389542b8e94f10840b95836e5 (patch) | |
tree | ffd7da6e190e903adff5476dfe8c35d3d66f9437 /src | |
parent | 82a45452f09a64b17a419f4c3aa66c420a01b228 (diff) | |
download | mailfromd-f4df8a05b9c015b389542b8e94f10840b95836e5.tar.gz mailfromd-f4df8a05b9c015b389542b8e94f10840b95836e5.tar.bz2 |
Fix compilation with gcc 10
* gacopyz/gacopyz_priv.h (__gacopyz_log_printer): Mark as extern.
* lib/mfdb.h (cache_format, rate_format)
(tbf_rate_format,greylist_format): Mark as extern.
(predict_rate,predict_next_option): New externs.
* src/dkim.c (dkim_signature_parse): Fix improper use of unprefixed
WRDSF_ constant.
* src/mfdbtool.c (predict_rate,predict_next_option): Remove variable
declarations.
* src/savsrv.c (writeout): Use memcpy instead of strncpy to shut
up the gcc warning.
* src/srvcfg.c (negative_expire_interval): Remove declaration.
Diffstat (limited to 'src')
-rw-r--r-- | src/dkim.c | 4 | ||||
-rw-r--r-- | src/mfdbtool.c | 2 | ||||
-rw-r--r-- | src/savsrv.c | 2 | ||||
-rw-r--r-- | src/srvcfg.c | 5 |
4 files changed, 3 insertions, 10 deletions
@@ -949,7 +949,7 @@ dkim_signature_parse(char *str, struct dkim_signature *ret_sig) MU_WRDSF_DELIM | MU_WRDSF_NOVAR | MU_WRDSF_WS | - WRDSF_NOCMD); + MU_WRDSF_NOCMD); if (rc) { mu_wordsplit_free(&ws); return rc; @@ -1624,7 +1624,7 @@ dnsrec_parse(char *rec, mu_assoc_t *pa) MU_WRDSF_DELIM | MU_WRDSF_NOVAR | MU_WRDSF_WS | - WRDSF_NOCMD)) { + MU_WRDSF_NOCMD)) { result = 1; } else { size_t i; diff --git a/src/mfdbtool.c b/src/mfdbtool.c index 048eaea7..bcfd4ab3 100644 --- a/src/mfdbtool.c +++ b/src/mfdbtool.c @@ -36,8 +36,6 @@ struct db_format *format_option; time_t expire_interval = 0; /* When set, overrides the expire interval for the selected database */ int all_option; /* Process all databases */ -int predict_next_option; -double predict_rate; /* Prediction rate for --list --format=rates*/ char *db_type_str = DEFAULT_DB_TYPE; void (*run)(int argc, char **argv) = NULL; diff --git a/src/savsrv.c b/src/savsrv.c index 7b1d901e..a809b4d6 100644 --- a/src/savsrv.c +++ b/src/savsrv.c @@ -106,7 +106,7 @@ writeout(FILE *fp, const char *fmt, ...) } if (fmt[fmtlen - 1] == '%' && fmt[fmtlen - 2] != '%') fmtlen--; - strncpy(fmtbuf + SPFXSIZ, fmt, fmtlen); + memcpy(fmtbuf + SPFXSIZ, fmt, fmtlen); fmtbuf[SPFXSIZ + fmtlen] = 0; trimcrlf(fmtbuf); if (dots) diff --git a/src/srvcfg.c b/src/srvcfg.c index b1ce4e6e..70948f27 100644 --- a/src/srvcfg.c +++ b/src/srvcfg.c @@ -66,11 +66,6 @@ time_t smtp_timeout_hard[SMTP_NUM_TIMEOUT] = { /* I/O timeout. Overrides unset smtp_timeouts */ time_t io_timeout = 3; - -time_t negative_expire_interval = DEFAULT_EXPIRE_INTERVAL/2; - /* Expire negative cache entries after this - number of seconds */ - static const char * next_server_id() |