From 514ed1085d7399f7fe3bb53e6ae4693168dd0ab9 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Mon, 22 Apr 2024 07:37:40 -0400 Subject: [PATCH 1/2] opendkim/opendkim.c: add two missing dkimf_dstring_get() calls This fixes the build with CFLAGS="-Werror=incompatible-pointer-types", which some newer compilers are planning to make default. Gentoo-Bug: https://bugs.gentoo.org/919366 --- opendkim/opendkim.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opendkim/opendkim.c b/opendkim/opendkim.c index d4229e8f..93d05a1e 100644 --- a/opendkim/opendkim.c +++ b/opendkim/opendkim.c @@ -11656,8 +11656,8 @@ mlfi_eoh(SMFICTX *ctx) (status != 0 || user == NULL || domain == NULL || user[0] == '\0' || domain[0] == '\0')) { - strlcpy(addr, conf->conf_defsender, sizeof addr); - status = dkim_mail_parse(addr, &user, &domain); + strlcpy(dkimf_dstring_get(addr), conf->conf_defsender, sizeof addr); + status = dkim_mail_parse(dkimf_dstring_get(addr), &user, &domain); } #endif /* _FFR_DEFAULT_SENDER */ From ec765ea074fcb93e2f7e193be09572a57e925191 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Mon, 22 Apr 2024 13:08:31 -0400 Subject: [PATCH 2/2] opendkim/opendkim.c: replace a strlcpy() with dkimf_dstring_copy() --- opendkim/opendkim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendkim/opendkim.c b/opendkim/opendkim.c index 93d05a1e..b4cf61ae 100644 --- a/opendkim/opendkim.c +++ b/opendkim/opendkim.c @@ -11656,7 +11656,7 @@ mlfi_eoh(SMFICTX *ctx) (status != 0 || user == NULL || domain == NULL || user[0] == '\0' || domain[0] == '\0')) { - strlcpy(dkimf_dstring_get(addr), conf->conf_defsender, sizeof addr); + dkimf_dstring_copy(addr, conf->conf_defsender); status = dkim_mail_parse(dkimf_dstring_get(addr), &user, &domain); } #endif /* _FFR_DEFAULT_SENDER */