Commit Diff


commit - ced7acc6aba99917f09e1fe3b8d830fba523be2b
commit + ad394dccdd83054bf6379b35acf8ec0782451d4d
blob - 91402a9023adaa67c5b5ade28faf9e931f9bccff
blob + f27e022f35caea7ba9880dcbcfaff4da28ee510f
--- Makefile
+++ Makefile
@@ -1,7 +1,7 @@
 #	$OpenBSD: Makefile,v 1.1 2018/04/26 13:57:13 eric Exp $
 
-PROG=	dnsbl
-BINDIR=	/usr/bin
+PROG=	filter-dnsbl
+BINDIR=	/usr/libexec/smtpd/
 SRCS+=	main.c log.c smtp_proc.c
 
 CFLAGS+= -g3 -O0
blob - e24c1ca92392875378a5a183d7c8b176c831b480 (mode 644)
blob + /dev/null
--- dnsbl.1
+++ /dev/null
@@ -1,38 +0,0 @@
-.\"	$OpenBSD$
-.\"
-.\" Copyright (c) 2019 Martijn van Duren <martijn@openbsd.org>
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.Dd $Mdocdate$
-.Dt FILTER-DNSBL 8
-.Os
-.Sh NAME
-.Nm filter-dnsbl
-.Nd block senders based on dnsbl
-.Sh SYNOPSIS
-.Nm
-.Op Fl m
-.Ar blacklist
-.Op Ar ...
-.Sh DESCRIPTION
-.Nm
-looks up the ip-address of the sender at the
-.Ar blacklist
-and by default drops the connection if it is found.
-If the
-.Fl m
-flag is specified it will allow the message to continue, but it will be marked
-with an X-Spam and X-Spam-DNSBL header.
-.Sh SEE ALSO
-.Xr smtpd 8
blob - /dev/null
blob + e24c1ca92392875378a5a183d7c8b176c831b480 (mode 644)
--- /dev/null
+++ filter-dnsbl.1
@@ -0,0 +1,38 @@
+.\"	$OpenBSD$
+.\"
+.\" Copyright (c) 2019 Martijn van Duren <martijn@openbsd.org>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd $Mdocdate$
+.Dt FILTER-DNSBL 8
+.Os
+.Sh NAME
+.Nm filter-dnsbl
+.Nd block senders based on dnsbl
+.Sh SYNOPSIS
+.Nm
+.Op Fl m
+.Ar blacklist
+.Op Ar ...
+.Sh DESCRIPTION
+.Nm
+looks up the ip-address of the sender at the
+.Ar blacklist
+and by default drops the connection if it is found.
+If the
+.Fl m
+flag is specified it will allow the message to continue, but it will be marked
+with an X-Spam and X-Spam-DNSBL header.
+.Sh SEE ALSO
+.Xr smtpd 8