commit 3ca25b7a33e400d1f930732b6d43e5940be15cc1
from: Martijn van Duren <martijn@openbsd.org>
date: Mon May 19 19:01:24 2025 UTC

Adjust for new libopensmtpd changes

commit - 1aa52bf5bfaea1110d1e02b20808fea070f36ea8
commit + 3ca25b7a33e400d1f930732b6d43e5940be15cc1
blob - 085bc7ac72402f2b4ce1f9743231d8c23d3685e9
blob + c74f6e5998e00daa39f0bbd0eec5bebc2669c533
--- main.c
+++ main.c
@@ -55,10 +55,10 @@ static int markspam = 0;
 static int verbose = 0;
 
 const char *dnsbl_printblacklist(const char *);
-void dnsbl_connect(struct osmtpd_ctx *, const char *,
+int dnsbl_connect(struct osmtpd_ctx *, const char *,
     struct sockaddr_storage *);
-void dnsbl_begin(struct osmtpd_ctx *, uint32_t);
-void dnsbl_dataline(struct osmtpd_ctx *, const char *);
+int dnsbl_begin(struct osmtpd_ctx *, uint32_t);
+int dnsbl_dataline(struct osmtpd_ctx *, const char *);
 void dnsbl_resolve(struct asr_result *, void *);
 void dnsbl_session_query_done(struct dnsbl_session *);
 void *dnsbl_session_new(struct osmtpd_ctx *);
@@ -122,7 +122,7 @@ dnsbl_printblacklist(const char *blacklist)
 	return blacklist;
 }
 
-void
+int
 dnsbl_connect(struct osmtpd_ctx *ctx, const char *hostname,
     struct sockaddr_storage *ss)
 {
@@ -177,6 +177,8 @@ dnsbl_connect(struct osmtpd_ctx *ctx, const char *host
 		session->query[i].session = session;
 		session->query[i].running = 1;
 	}
+
+	return 0;
 }
 
 void
@@ -220,7 +222,7 @@ dnsbl_resolve(struct asr_result *result, void *arg)
 		    session->ctx->reqid);
 }
 
-void
+int
 dnsbl_begin(struct osmtpd_ctx *ctx, uint32_t msgid)
 {
 	struct dnsbl_session *session = ctx->local_session;
@@ -234,9 +236,11 @@ dnsbl_begin(struct osmtpd_ctx *ctx, uint32_t msgid)
 		}
 		session->set_header = 1;
 	}
+
+	return 0;
 }
 
-void
+int
 dnsbl_dataline(struct osmtpd_ctx *ctx, const char *line)
 {
 	struct dnsbl_session *session = ctx->local_session;
@@ -249,6 +253,8 @@ dnsbl_dataline(struct osmtpd_ctx *ctx, const char *lin
 		
 	}
 	osmtpd_filter_dataline(ctx, "%s", line);
+
+	return 0;
 }
 
 void