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.

6 files changed, 11 insertions, 15 deletions

diff --git a/gacopyz/gacopyz_priv.h b/gacopyz/gacopyz_priv.h
index ee981b9f..5753f73d 100644
--- a/gacopyz/gacopyz_priv.h
+++ b/gacopyz/gacopyz_priv.h
@@ -66,7 +66,7 @@ typedef unsigned long gacopyz_uint32_t;
 
 #define GACOPYZ_OPTLEN  (sizeof(gacopyz_uint32_t) * 3) /* length of options */
 
-void (*__gacopyz_log_printer)(int, char *, va_list);
+extern void (*__gacopyz_log_printer)(int, char *, va_list);
 
 #define GACOPYZ_DESC_LOG_MATCH(dsc, level) \
   ((dsc)->logmask & SMI_LOG_MASK(level))
diff --git a/lib/mfdb.h b/lib/mfdb.h
index 71bf7a7c..8ef2f5e9 100644
--- a/lib/mfdb.h
+++ b/lib/mfdb.h
@@ -36,10 +36,13 @@ extern mu_debug_handle_t db_debug_handle;
 extern struct db_format *cache_format;
 extern int mf_database_mode;
 
-struct db_format *cache_format;
-struct db_format *rate_format;
-struct db_format *tbf_rate_format;
-struct db_format *greylist_format;
+extern struct db_format *cache_format;
+extern struct db_format *rate_format;
+extern struct db_format *tbf_rate_format;
+extern struct db_format *greylist_format;
+
+extern int predict_next_option; 
+extern double predict_rate;  /* Prediction rate for --list --format=rates*/
 
 mu_dbm_file_t mf_dbm_open(char *dbname, int access);
 int mf_file_mode_to_safety_criteria(int mode);
diff --git a/src/dkim.c b/src/dkim.c
index 6aba9792..0a058845 100644
--- a/src/dkim.c
+++ b/src/dkim.c
@@ -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()