Hi.
Slightly updated diff, including sys/tree.h in smtpd.h.
Eric.
Index: aliases.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/aliases.c,v
retrieving revision 1.78
diff -u -p -r1.78 aliases.c
--- aliases.c 28 Apr 2020 21:46:43 -0000 1.78
+++ aliases.c 26 May 2021 20:15:02 -0000
@@ -16,19 +16,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <event.h>
-#include <imsg.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <limits.h>
#include <util.h>
#include "smtpd.h"
Index: bounce.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/bounce.c,v
retrieving revision 1.84
diff -u -p -r1.84 bounce.c
--- bounce.c 26 May 2021 18:08:55 -0000 1.84
+++ bounce.c 26 May 2021 20:14:41 -0000
@@ -18,23 +18,11 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-
#include <errno.h>
-#include <event.h>
-#include <imsg.h>
#include <inttypes.h>
-#include <pwd.h>
-#include <signal.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include <unistd.h>
-#include <limits.h>
#include "smtpd.h"
#include "log.h"
Index: ca.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/ca.c,v
retrieving revision 1.39
diff -u -p -r1.39 ca.c
--- ca.c 26 May 2021 18:08:55 -0000 1.39
+++ ca.c 27 May 2021 10:57:24 -0000
@@ -17,26 +17,12 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/socket.h>
-#include <sys/tree.h>
-
-#include <imsg.h>
-#include <limits.h>
+#include <openssl/pem.h>
+#include <openssl/engine.h>
#include <pwd.h>
#include <signal.h>
-#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-
-#include <openssl/ssl.h>
-#include <openssl/pem.h>
-#include <openssl/evp.h>
-#include <openssl/ecdsa.h>
-#include <openssl/rsa.h>
-#include <openssl/engine.h>
-#include <openssl/err.h>
#include "smtpd.h"
#include "log.h"
Index: compress_backend.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/compress_backend.c,v
retrieving revision 1.9
diff -u -p -r1.9 compress_backend.c
--- compress_backend.c 20 Jan 2015 17:37:54 -0000 1.9
+++ compress_backend.c 26 May 2021 20:13:39 -0000
@@ -17,18 +17,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-
-#include <imsg.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include <limits.h>
#include "smtpd.h"
Index: compress_gzip.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/compress_gzip.c,v
retrieving revision 1.12
diff -u -p -r1.12 compress_gzip.c
--- compress_gzip.c 26 May 2021 18:08:55 -0000 1.12
+++ compress_gzip.c 27 May 2021 11:01:41 -0000
@@ -17,27 +17,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-
-#include <ctype.h>
-#include <fcntl.h>
-#include <imsg.h>
-#include <pwd.h>
-#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <limits.h>
-
#include <zlib.h>
#include "smtpd.h"
-#include "log.h"
-
#define GZIP_BUFFER_SIZE 16384
Index: config.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/config.c,v
retrieving revision 1.56
diff -u -p -r1.56 config.c
--- config.c 26 May 2021 07:05:50 -0000 1.56
+++ config.c 26 May 2021 20:13:14 -0000
@@ -16,23 +16,11 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
#include <sys/resource.h>
-#include <event.h>
#include <ifaddrs.h>
-#include <imsg.h>
-#include <netdb.h>
-#include <stdio.h>
#include <stdlib.h>
-#include <limits.h>
#include <string.h>
-#include <unistd.h>
-
-#include <openssl/ssl.h>
#include "smtpd.h"
#include "log.h"
Index: control.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/control.c,v
retrieving revision 1.127
diff -u -p -r1.127 control.c
--- control.c 26 May 2021 18:08:55 -0000 1.127
+++ control.c 26 May 2021 20:12:43 -0000
@@ -18,25 +18,15 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
#include <sys/stat.h>
-#include <sys/socket.h>
#include <sys/un.h>
#include <errno.h>
-#include <event.h>
-#include <fcntl.h>
-#include <imsg.h>
#include <pwd.h>
#include <signal.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include <unistd.h>
-#include <limits.h>
#include "smtpd.h"
#include "log.h"
Index: crypto.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/crypto.c,v
retrieving revision 1.9
diff -u -p -r1.9 crypto.c
--- crypto.c 23 Jan 2021 16:11:11 -0000 1.9
+++ crypto.c 27 May 2021 11:01:30 -0000
@@ -16,14 +16,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/stat.h>
-#include <stdlib.h>
-#include <string.h>
-
#include <openssl/evp.h>
-
+#include <string.h>
#define CRYPTO_BUFFER_SIZE 16384
Index: dict.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/dict.c,v
retrieving revision 1.7
diff -u -p -r1.7 dict.c
--- dict.c 26 May 2021 18:08:55 -0000 1.7
+++ dict.c 26 May 2021 20:10:54 -0000
@@ -17,12 +17,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/tree.h>
#include <stdlib.h>
#include <string.h>
-#include <limits.h>
#include "dict.h"
#include "log.h"
Index: dispatcher.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/dispatcher.c,v
retrieving revision 1.4
diff -u -p -r1.4 dispatcher.c
--- dispatcher.c 26 May 2021 18:08:55 -0000 1.4
+++ dispatcher.c 26 May 2021 20:10:34 -0000
@@ -16,25 +16,9 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <event.h>
-#include <imsg.h>
-#include <inttypes.h>
#include <pwd.h>
#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
#include <unistd.h>
-#include <limits.h>
-#include <grp.h>
#include "smtpd.h"
#include "log.h"
Index: dns.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/dns.c,v
retrieving revision 1.89
diff -u -p -r1.89 dns.c
--- dns.c 18 Sep 2019 11:26:30 -0000 1.89
+++ dns.c 27 May 2021 10:24:45 -0000
@@ -18,24 +18,13 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/socket.h>
-#include <sys/tree.h>
-#include <sys/queue.h>
-#include <sys/uio.h>
#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
#include <asr.h>
-#include <event.h>
-#include <imsg.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <limits.h>
#include "smtpd.h"
#include "log.h"
Index: enqueue.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/enqueue.c,v
retrieving revision 1.118
diff -u -p -r1.118 enqueue.c
--- enqueue.c 18 Mar 2020 20:17:14 -0000 1.118
+++ enqueue.c 26 May 2021 20:08:19 -0000
@@ -18,27 +18,13 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/socket.h>
-#include <sys/tree.h>
-#include <sys/stat.h>
-
#include <ctype.h>
#include <err.h>
#include <errno.h>
-#include <event.h>
-#include <grp.h>
-#include <imsg.h>
-#include <inttypes.h>
#include <pwd.h>
-#include <stdarg.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include <unistd.h>
-#include <limits.h>
#include "smtpd.h"
Index: envelope.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/envelope.c,v
retrieving revision 1.48
diff -u -p -r1.48 envelope.c
--- envelope.c 26 May 2021 18:08:55 -0000 1.48
+++ envelope.c 26 May 2021 20:07:06 -0000
@@ -17,28 +17,11 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-
-#include <netinet/in.h>
#include <arpa/inet.h>
#include <ctype.h>
-#include <errno.h>
-#include <event.h>
-#include <fcntl.h>
-#include <imsg.h>
-#include <inttypes.h>
-#include <pwd.h>
-#include <limits.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
-#include <unistd.h>
#include "smtpd.h"
#include "log.h"
Index: esc.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/esc.c,v
retrieving revision 1.5
diff -u -p -r1.5 esc.c
--- esc.c 3 Sep 2016 22:16:39 -0000 1.5
+++ esc.c 27 May 2021 10:28:46 -0000
@@ -16,14 +16,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/queue.h>
#include <sys/tree.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <stdio.h>
#include <limits.h>
+#include <stdio.h>
#include "smtpd-defines.h"
#include "smtpd-api.h"
Index: expand.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/expand.c,v
retrieving revision 1.31
diff -u -p -r1.31 expand.c
--- expand.c 31 May 2018 21:06:12 -0000 1.31
+++ expand.c 27 May 2021 10:58:59 -0000
@@ -17,21 +17,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-
-#include <ctype.h>
-#include <event.h>
-#include <imsg.h>
-#include <stdio.h>
-#include <limits.h>
#include <stdlib.h>
#include <string.h>
#include "smtpd.h"
-#include "log.h"
static const char *expandnode_info(struct expandnode *);
Index: forward.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/forward.c,v
retrieving revision 1.39
diff -u -p -r1.39 forward.c
--- forward.c 28 Dec 2015 22:08:30 -0000 1.39
+++ forward.c 26 May 2021 20:05:31 -0000
@@ -16,21 +16,11 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
#include <sys/stat.h>
-#include <ctype.h>
-#include <event.h>
-#include <imsg.h>
-#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
#include <util.h>
#include <unistd.h>
-#include <limits.h>
#include "smtpd.h"
#include "log.h"
Index: iobuf.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/iobuf.c,v
retrieving revision 1.15
diff -u -p -r1.15 iobuf.c
--- iobuf.c 5 Mar 2021 12:37:32 -0000 1.15
+++ iobuf.c 26 May 2021 20:05:04 -0000
@@ -15,8 +15,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/socket.h>
#include <sys/uio.h>
#include <errno.h>
Index: ioev.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/ioev.c,v
retrieving revision 1.47
diff -u -p -r1.47 ioev.c
--- ioev.c 26 May 2021 18:08:55 -0000 1.47
+++ ioev.c 26 May 2021 20:03:22 -0000
@@ -15,8 +15,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
#include <sys/socket.h>
#include <errno.h>
Index: limit.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/limit.c,v
retrieving revision 1.6
diff -u -p -r1.6 limit.c
--- limit.c 26 May 2021 18:08:55 -0000 1.6
+++ limit.c 27 May 2021 09:42:51 -0000
@@ -16,22 +16,9 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-
-#include <ctype.h>
-#include <event.h>
-#include <fcntl.h>
-#include <imsg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
#include <string.h>
#include "smtpd.h"
-#include "log.h"
void
limit_mta_set_defaults(struct mta_limits *limits)
Index: lka.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/lka.c,v
retrieving revision 1.246
diff -u -p -r1.246 lka.c
--- lka.c 26 May 2021 18:08:55 -0000 1.246
+++ lka.c 26 May 2021 20:02:01 -0000
@@ -18,33 +18,16 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
#include <sys/wait.h>
-#include <sys/uio.h>
-#include <netinet/in.h>
-
-#include <ctype.h>
#include <errno.h>
-#include <event.h>
-#include <imsg.h>
-#include <openssl/err.h>
-#include <openssl/ssl.h>
#include <pwd.h>
-#include <resolv.h>
-#include <limits.h>
#include <signal.h>
-#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
#include <unistd.h>
#include "smtpd.h"
#include "log.h"
-#include "ssl.h"
static void lka_imsg(struct mproc *, struct imsg *);
static void lka_shutdown(void);
Index: lka_filter.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/lka_filter.c,v
retrieving revision 1.67
diff -u -p -r1.67 lka_filter.c
--- lka_filter.c 23 Jan 2021 16:11:11 -0000 1.67
+++ lka_filter.c 26 May 2021 20:01:13 -0000
@@ -16,19 +16,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-
#include <errno.h>
-#include <event.h>
-#include <imsg.h>
#include <inttypes.h>
-#include <limits.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Index: lka_session.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/lka_session.c,v
retrieving revision 1.94
diff -u -p -r1.94 lka_session.c
--- lka_session.c 31 Dec 2020 08:27:15 -0000 1.94
+++ lka_session.c 26 May 2021 20:00:43 -0000
@@ -17,26 +17,9 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
-
-#include <netinet/in.h>
-
-#include <ctype.h>
#include <errno.h>
-#include <event.h>
-#include <imsg.h>
-#include <resolv.h>
-#include <pwd.h>
-#include <signal.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include <limits.h>
#include "smtpd.h"
#include "log.h"
Index: mail.lmtp.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/mail.lmtp.c,v
retrieving revision 1.15
diff -u -p -r1.15 mail.lmtp.c
--- mail.lmtp.c 23 Jan 2021 16:11:11 -0000 1.15
+++ mail.lmtp.c 26 May 2021 20:00:19 -0000
@@ -14,7 +14,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
Index: mail.maildir.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/mail.maildir.c,v
retrieving revision 1.14
diff -u -p -r1.14 mail.maildir.c
--- mail.maildir.c 23 Jan 2021 16:11:11 -0000 1.14
+++ mail.maildir.c 26 May 2021 20:44:00 -0000
@@ -18,10 +18,8 @@
#define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
#endif
-#include <sys/types.h>
#include <sys/stat.h>
-#include <ctype.h>
#include <err.h>
#include <errno.h>
#include <fcntl.h>
@@ -30,7 +28,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include <sysexits.h>
#include <unistd.h>
Index: mail.mboxfile.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/mail.mboxfile.c,v
retrieving revision 1.5
diff -u -p -r1.5 mail.mboxfile.c
--- mail.mboxfile.c 23 Jan 2021 16:11:11 -0000 1.5
+++ mail.mboxfile.c 26 May 2021 19:56:14 -0000
@@ -15,18 +15,15 @@
*/
#include <sys/types.h>
-#include <sys/stat.h>
-#include <ctype.h>
#include <err.h>
#include <errno.h>
#include <fcntl.h>
-#include <limits.h>
-#include <netdb.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sysexits.h>
+#include <time.h>
#include <unistd.h>
static void mboxfile_engine(const char *sender, const char *filename);
Index: mail.mda.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/mail.mda.c,v
retrieving revision 1.3
diff -u -p -r1.3 mail.mda.c
--- mail.mda.c 25 Nov 2018 17:34:00 -0000 1.3
+++ mail.mda.c 26 May 2021 19:54:36 -0000
@@ -14,17 +14,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/stat.h>
#include <sys/wait.h>
-#include <ctype.h>
#include <err.h>
#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <netdb.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sysexits.h>
Index: mailaddr.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/mailaddr.c,v
retrieving revision 1.4
diff -u -p -r1.4 mailaddr.c
--- mailaddr.c 22 Sep 2020 18:04:27 -0000 1.4
+++ mailaddr.c 26 May 2021 19:53:55 -0000
@@ -16,16 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-
-#include <ctype.h>
-#include <event.h>
-#include <imsg.h>
-#include <stdio.h>
-#include <limits.h>
#include <stdlib.h>
#include <string.h>
Index: makemap.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/makemap.c,v
retrieving revision 1.74
diff -u -p -r1.74 makemap.c
--- makemap.c 27 Jan 2021 07:20:27 -0000 1.74
+++ makemap.c 26 May 2021 19:53:40 -0000
@@ -17,25 +17,17 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/stat.h>
-#include <sys/tree.h>
-#include <sys/queue.h>
-#include <sys/socket.h>
#include <ctype.h>
#include <db.h>
#include <err.h>
#include <errno.h>
-#include <event.h>
#include <fcntl.h>
-#include <imsg.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
#include <unistd.h>
-#include <limits.h>
#include <util.h>
#include "smtpd.h"
Index: mda.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/mda.c,v
retrieving revision 1.142
diff -u -p -r1.142 mda.c
--- mda.c 26 May 2021 18:08:55 -0000 1.142
+++ mda.c 26 May 2021 19:51:29 -0000
@@ -19,25 +19,12 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-
#include <ctype.h>
-#include <errno.h>
-#include <event.h>
-#include <imsg.h>
#include <inttypes.h>
-#include <pwd.h>
-#include <signal.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sysexits.h>
-#include <time.h>
#include <unistd.h>
-#include <limits.h>
#include <vis.h>
#include "smtpd.h"
Index: mda_mbox.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/mda_mbox.c,v
retrieving revision 1.2
diff -u -p -r1.2 mda_mbox.c
--- mda_mbox.c 3 Feb 2020 15:41:22 -0000 1.2
+++ mda_mbox.c 27 May 2021 11:00:27 -0000
@@ -16,27 +16,15 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/stat.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
#include <err.h>
#include <errno.h>
-#include <event.h>
#include <fcntl.h>
-#include <imsg.h>
#include <paths.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sysexits.h>
#include <unistd.h>
-#include <limits.h>
#include "smtpd.h"
-
void
mda_mbox(struct deliver *deliver)
Index: mda_unpriv.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/mda_unpriv.c,v
retrieving revision 1.7
diff -u -p -r1.7 mda_unpriv.c
--- mda_unpriv.c 1 Jun 2020 05:21:30 -0000 1.7
+++ mda_unpriv.c 27 May 2021 11:00:24 -0000
@@ -16,24 +16,12 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-
#include <err.h>
-#include <errno.h>
-#include <event.h>
-#include <imsg.h>
#include <paths.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <limits.h>
#include "smtpd.h"
-
void
mda_unpriv(struct dispatcher *dsp, struct deliver *deliver,
Index: mda_variables.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/mda_variables.c,v
retrieving revision 1.6
diff -u -p -r1.6 mda_variables.c
--- mda_variables.c 19 Sep 2019 07:35:36 -0000 1.6
+++ mda_variables.c 26 May 2021 19:49:17 -0000
@@ -17,19 +17,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-
-#include <imsg.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include <limits.h>
#include "smtpd.h"
#include "log.h"
Index: mproc.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/mproc.c,v
retrieving revision 1.38
diff -u -p -r1.38 mproc.c
--- mproc.c 26 May 2021 18:08:55 -0000 1.38
+++ mproc.c 26 May 2021 19:48:58 -0000
@@ -16,22 +16,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/tree.h>
-#include <sys/queue.h>
-#include <sys/uio.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
#include <errno.h>
-#include <event.h>
-#include <imsg.h>
-#include <stdio.h>
#include <stdlib.h>
-#include <limits.h>
#include <string.h>
#include <unistd.h>
Index: mta.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/mta.c,v
retrieving revision 1.239
diff -u -p -r1.239 mta.c
--- mta.c 26 May 2021 18:08:55 -0000 1.239
+++ mta.c 26 May 2021 19:48:27 -0000
@@ -19,26 +19,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <event.h>
-#include <imsg.h>
#include <inttypes.h>
-#include <netdb.h>
-#include <limits.h>
-#include <pwd.h>
-#include <signal.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include <tls.h>
-#include <unistd.h>
#include "smtpd.h"
#include "log.h"
Index: mta_session.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/mta_session.c,v
retrieving revision 1.142
diff -u -p -r1.142 mta_session.c
--- mta_session.c 26 May 2021 18:08:55 -0000 1.142
+++ mta_session.c 26 May 2021 19:47:53 -0000
@@ -19,35 +19,18 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
#include <sys/stat.h>
-#include <sys/uio.h>
-#include <arpa/inet.h>
#include <ctype.h>
#include <errno.h>
-#include <event.h>
-#include <imsg.h>
#include <inttypes.h>
-#include <netdb.h>
-#include <openssl/ssl.h>
-#include <pwd.h>
-#include <resolv.h>
-#include <limits.h>
-#include <signal.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include <tls.h>
#include <unistd.h>
#include "smtpd.h"
#include "log.h"
-#include "ssl.h"
#define MAX_TRYBEFOREDISABLE 10
Index: parse.y
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/parse.y,v
retrieving revision 1.288
diff -u -p -r1.288 parse.y
--- parse.y 26 May 2021 18:08:55 -0000 1.288
+++ parse.y 27 May 2021 10:38:10 -0000
@@ -22,35 +22,21 @@
*/
%{
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <net/if.h>
#include <netinet/in.h>
-#include <arpa/inet.h>
+#include <arpa/inet.h>
#include <ctype.h>
#include <errno.h>
-#include <event.h>
#include <ifaddrs.h>
-#include <imsg.h>
#include <inttypes.h>
-#include <limits.h>
-#include <netdb.h>
-#include <pwd.h>
#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <syslog.h>
#include <unistd.h>
#include <util.h>
-
-#include <openssl/ssl.h>
#include "smtpd.h"
#include "ssl.h"
Index: parser.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/parser.c,v
retrieving revision 1.42
diff -u -p -r1.42 parser.c
--- parser.c 6 Jan 2020 11:02:38 -0000 1.42
+++ parser.c 27 May 2021 11:00:04 -0000
@@ -16,14 +16,13 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/queue.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <net/if.h>
-#include <arpa/inet.h>
+#include <arpa/inet.h>
#include <err.h>
#include <inttypes.h>
#include <limits.h>
Index: proxy.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/proxy.c,v
retrieving revision 1.2
diff -u -p -r1.2 proxy.c
--- proxy.c 26 May 2021 18:08:55 -0000 1.2
+++ proxy.c 27 May 2021 10:59:58 -0000
@@ -14,24 +14,14 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/tree.h>
#include <sys/un.h>
-#include <errno.h>
-#include <event.h>
-#include <imsg.h>
#include <inttypes.h>
-#include <limits.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include "log.h"
#include "smtpd.h"
-
+#include "log.h"
/*
* The PROXYv2 protocol is described here:
Index: queue.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/queue.c,v
retrieving revision 1.192
diff -u -p -r1.192 queue.c
--- queue.c 26 May 2021 18:08:55 -0000 1.192
+++ queue.c 27 May 2021 09:43:14 -0000
@@ -18,23 +18,12 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-
-#include <event.h>
-#include <imsg.h>
#include <inttypes.h>
#include <pwd.h>
#include <signal.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include <unistd.h>
-#include <limits.h>
#include "smtpd.h"
#include "log.h"
Index: queue_backend.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/queue_backend.c,v
retrieving revision 1.67
diff -u -p -r1.67 queue_backend.c
--- queue_backend.c 26 May 2021 18:08:55 -0000 1.67
+++ queue_backend.c 26 May 2021 19:44:06 -0000
@@ -16,25 +16,13 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-
-#include <ctype.h>
#include <errno.h>
-#include <event.h>
#include <fcntl.h>
#include <grp.h>
-#include <imsg.h>
-#include <limits.h>
#include <inttypes.h>
#include <pwd.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include <unistd.h>
#include "smtpd.h"
Index: queue_fs.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/queue_fs.c,v
retrieving revision 1.21
diff -u -p -r1.21 queue_fs.c
--- queue_fs.c 26 May 2021 18:08:55 -0000 1.21
+++ queue_fs.c 26 May 2021 19:42:49 -0000
@@ -18,24 +18,16 @@
#include <sys/types.h>
#include <sys/mount.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
#include <sys/stat.h>
-#include <ctype.h>
#include <dirent.h>
#include <errno.h>
-#include <event.h>
#include <fcntl.h>
#include <fts.h>
-#include <imsg.h>
#include <inttypes.h>
#include <pwd.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include <unistd.h>
#include "smtpd.h"
Index: queue_null.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/queue_null.c,v
retrieving revision 1.9
diff -u -p -r1.9 queue_null.c
--- queue_null.c 26 May 2021 18:08:55 -0000 1.9
+++ queue_null.c 27 May 2021 09:43:20 -0000
@@ -16,28 +16,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <event.h>
-#include <fcntl.h>
-#include <imsg.h>
-#include <inttypes.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-#include <limits.h>
-
#include "smtpd.h"
-#include "log.h"
static int
queue_null_message_create(uint32_t *msgid)
Index: queue_proc.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/queue_proc.c,v
retrieving revision 1.8
diff -u -p -r1.8 queue_proc.c
--- queue_proc.c 30 Dec 2018 23:09:58 -0000 1.8
+++ queue_proc.c 26 May 2021 19:41:00 -0000
@@ -16,25 +16,9 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-
-#include <ctype.h>
#include <errno.h>
-#include <event.h>
#include <fcntl.h>
-#include <imsg.h>
-#include <inttypes.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
-#include <time.h>
-#include <unistd.h>
-#include <limits.h>
#include "smtpd.h"
#include "log.h"
Index: queue_ram.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/queue_ram.c,v
retrieving revision 1.10
diff -u -p -r1.10 queue_ram.c
--- queue_ram.c 26 May 2021 18:08:55 -0000 1.10
+++ queue_ram.c 26 May 2021 19:40:27 -0000
@@ -16,25 +16,11 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
#include <sys/stat.h>
-#include <ctype.h>
-#include <errno.h>
-#include <event.h>
-#include <fcntl.h>
-#include <imsg.h>
-#include <inttypes.h>
-#include <pwd.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include <unistd.h>
-#include <limits.h>
#include "smtpd.h"
#include "log.h"
Index: report_smtp.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/report_smtp.c,v
retrieving revision 1.11
diff -u -p -r1.11 report_smtp.c
--- report_smtp.c 7 Jan 2020 23:03:37 -0000 1.11
+++ report_smtp.c 26 May 2021 19:39:48 -0000
@@ -16,32 +16,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-
-#include <netinet/in.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <event.h>
-#include <imsg.h>
-#include <limits.h>
-#include <inttypes.h>
-#include <openssl/ssl.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <vis.h>
-
#include "smtpd.h"
-#include "log.h"
-#include "ssl.h"
-#include "rfc5322.h"
void
report_smtp_link_connect(const char *direction, uint64_t qid, const char
*rdns, int fcrdns,
Index: resolver.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/resolver.c,v
retrieving revision 1.6
diff -u -p -r1.6 resolver.c
--- resolver.c 23 Dec 2020 15:42:03 -0000 1.6
+++ resolver.c 27 May 2021 10:42:02 -0000
@@ -16,22 +16,14 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/socket.h>
-#include <sys/tree.h>
-#include <sys/queue.h>
+
#include <netinet/in.h>
#include <asr.h>
-#include <ctype.h>
#include <errno.h>
-#include <imsg.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include "smtpd.h"
#include "log.h"
Index: rfc5322.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/rfc5322.c,v
retrieving revision 1.2
diff -u -p -r1.2 rfc5322.c
--- rfc5322.c 24 Oct 2018 18:59:29 -0000 1.2
+++ rfc5322.c 26 May 2021 19:38:35 -0000
@@ -16,7 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <ctype.h>
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
Index: ruleset.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/ruleset.c,v
retrieving revision 1.47
diff -u -p -r1.47 ruleset.c
--- ruleset.c 25 Nov 2019 14:18:33 -0000 1.47
+++ ruleset.c 27 May 2021 09:43:31 -0000
@@ -16,22 +16,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-
#include <errno.h>
-#include <event.h>
-#include <imsg.h>
-#include <stdio.h>
#include <string.h>
-#include <limits.h>
#include "smtpd.h"
-#include "log.h"
#define MATCH_RESULT(r, neg) ((r) == -1 ? -1 : ((neg) < 0 ? !(r) : (r)))
Index: runq.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/runq.c,v
retrieving revision 1.3
diff -u -p -r1.3 runq.c
--- runq.c 14 Jun 2019 19:55:25 -0000 1.3
+++ runq.c 26 May 2021 19:37:48 -0000
@@ -16,17 +16,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/uio.h>
-
-#include <imsg.h>
-#include <stdio.h>
#include <stdlib.h>
-#include <limits.h>
-#include <time.h>
#include "smtpd.h"
Index: scheduler.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/scheduler.c,v
retrieving revision 1.61
diff -u -p -r1.61 scheduler.c
--- scheduler.c 26 May 2021 18:08:55 -0000 1.61
+++ scheduler.c 26 May 2021 19:37:37 -0000
@@ -19,26 +19,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-
-#include <ctype.h>
-#include <dirent.h>
-#include <errno.h>
-#include <event.h>
-#include <imsg.h>
#include <inttypes.h>
#include <pwd.h>
#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
#include <unistd.h>
-#include <limits.h>
#include "smtpd.h"
#include "log.h"
Index: scheduler_backend.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/scheduler_backend.c,v
retrieving revision 1.17
diff -u -p -r1.17 scheduler_backend.c
--- scheduler_backend.c 26 May 2021 18:08:55 -0000 1.17
+++ scheduler_backend.c 27 May 2021 09:43:41 -0000
@@ -16,22 +16,9 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-
-#include <ctype.h>
-#include <event.h>
-#include <fcntl.h>
-#include <imsg.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
-#include <limits.h>
#include "smtpd.h"
-#include "log.h"
extern struct scheduler_backend scheduler_backend_null;
extern struct scheduler_backend scheduler_backend_proc;
Index: scheduler_null.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/scheduler_null.c,v
retrieving revision 1.10
diff -u -p -r1.10 scheduler_null.c
--- scheduler_null.c 26 May 2021 18:08:55 -0000 1.10
+++ scheduler_null.c 26 May 2021 19:03:24 -0000
@@ -16,18 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-
-#include <ctype.h>
-#include <event.h>
-#include <fcntl.h>
-#include <imsg.h>
-#include <stdio.h>
-#include <limits.h>
-
#include "smtpd.h"
static int scheduler_null_init(const char *);
Index: scheduler_proc.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/scheduler_proc.c,v
retrieving revision 1.8
diff -u -p -r1.8 scheduler_proc.c
--- scheduler_proc.c 5 Dec 2015 13:14:21 -0000 1.8
+++ scheduler_proc.c 26 May 2021 19:37:03 -0000
@@ -16,21 +16,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-
-#include <ctype.h>
#include <errno.h>
-#include <event.h>
-#include <fcntl.h>
-#include <imsg.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include <limits.h>
#include "smtpd.h"
#include "log.h"
Index: scheduler_ramqueue.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/scheduler_ramqueue.c,v
retrieving revision 1.46
diff -u -p -r1.46 scheduler_ramqueue.c
--- scheduler_ramqueue.c 26 May 2021 18:08:55 -0000 1.46
+++ scheduler_ramqueue.c 26 May 2021 19:36:48 -0000
@@ -17,21 +17,9 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-
-#include <ctype.h>
-#include <event.h>
-#include <fcntl.h>
-#include <imsg.h>
#include <inttypes.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <limits.h>
-#include <time.h>
#include "smtpd.h"
#include "log.h"
Index: smtp.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/smtp.c,v
retrieving revision 1.170
diff -u -p -r1.170 smtp.c
--- smtp.c 26 May 2021 18:08:55 -0000 1.170
+++ smtp.c 26 May 2021 19:36:27 -0000
@@ -18,25 +18,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-
#include <errno.h>
-#include <event.h>
-#include <imsg.h>
-#include <netdb.h>
-#include <pwd.h>
-#include <signal.h>
-#include <limits.h>
-#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
#include <tls.h>
#include <unistd.h>
-
-#include <openssl/ssl.h>
#include "smtpd.h"
#include "log.h"
Index: smtp_client.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/smtp_client.c,v
retrieving revision 1.15
diff -u -p -r1.15 smtp_client.c
--- smtp_client.c 5 Mar 2021 12:37:32 -0000 1.15
+++ smtp_client.c 26 May 2021 19:35:54 -0000
@@ -25,7 +25,6 @@
#include <errno.h>
#include <limits.h>
#include <resolv.h>
-#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Index: smtp_session.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/smtp_session.c,v
retrieving revision 1.430
diff -u -p -r1.430 smtp_session.c
--- smtp_session.c 20 May 2021 07:33:32 -0000 1.430
+++ smtp_session.c 26 May 2021 19:34:15 -0000
@@ -19,23 +19,9 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-
-#include <netinet/in.h>
-
#include <ctype.h>
#include <errno.h>
-#include <event.h>
-#include <imsg.h>
-#include <limits.h>
#include <inttypes.h>
-#include <openssl/ssl.h>
-#include <resolv.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <tls.h>
@@ -44,7 +30,6 @@
#include "smtpd.h"
#include "log.h"
-#include "ssl.h"
#include "rfc5322.h"
#define SMTP_LINE_MAX 65535
Index: smtpc.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/smtpc.c,v
retrieving revision 1.17
diff -u -p -r1.17 smtpc.c
--- smtpc.c 23 May 2021 15:57:32 -0000 1.17
+++ smtpc.c 26 May 2021 19:33:06 -0000
@@ -16,15 +16,11 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/socket.h>
#include <event.h>
-#include <limits.h>
#include <netdb.h>
#include <pwd.h>
-#include <resolv.h>
-#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Index: smtpctl.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/smtpctl.c,v
retrieving revision 1.168
diff -u -p -r1.168 smtpctl.c
--- smtpctl.c 26 May 2021 18:08:55 -0000 1.168
+++ smtpctl.c 26 May 2021 19:31:59 -0000
@@ -21,30 +21,19 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
#include <sys/un.h>
-#include <sys/wait.h>
#include <sys/stat.h>
#include <err.h>
#include <errno.h>
-#include <event.h>
#include <fts.h>
-#include <grp.h>
-#include <imsg.h>
#include <inttypes.h>
#include <pwd.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
-#include <time.h>
#include <unistd.h>
#include <vis.h>
-#include <limits.h>
#include "smtpd.h"
#include "parser.h"
Index: smtpd.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/smtpd.c,v
retrieving revision 1.339
diff -u -p -r1.339 smtpd.c
--- smtpd.c 26 May 2021 18:08:55 -0000 1.339
+++ smtpd.c 26 May 2021 19:30:12 -0000
@@ -18,41 +18,26 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
#include <sys/wait.h>
#include <sys/stat.h>
-#include <sys/uio.h>
-#include <sys/mman.h>
#include <bsd_auth.h>
#include <dirent.h>
#include <errno.h>
-#include <event.h>
#include <fcntl.h>
#include <fts.h>
#include <grp.h>
-#include <imsg.h>
#include <inttypes.h>
-#include <login_cap.h>
#include <paths.h>
#include <poll.h>
#include <pwd.h>
#include <signal.h>
-#include <stdio.h>
#include <syslog.h>
-#include <limits.h>
#include <stdlib.h>
#include <string.h>
#include <sysexits.h>
-#include <time.h>
#include <tls.h>
#include <unistd.h>
-
-#include <openssl/ssl.h>
-#include <openssl/evp.h>
#include "smtpd.h"
#include "log.h"
Index: smtpd.h
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/smtpd.h,v
retrieving revision 1.668
diff -u -p -r1.668 smtpd.h
--- smtpd.h 21 Apr 2021 07:54:10 -0000 1.668
+++ smtpd.h 27 May 2021 14:36:14 -0000
@@ -22,9 +22,15 @@
#define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
#endif
-#include <netinet/in.h>
-#include <netdb.h>
+#include <sys/queue.h>
+#include <sys/tree.h>
+#include <sys/socket.h>
+
#include <event.h>
+#include <imsg.h>
+#include <limits.h>
+#include <netdb.h>
+#include <stdio.h>
#include "smtpd-defines.h"
#include "smtpd-api.h"
Index: spfwalk.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/spfwalk.c,v
retrieving revision 1.19
diff -u -p -r1.19 spfwalk.c
--- spfwalk.c 14 Sep 2020 11:15:25 -0000 1.19
+++ spfwalk.c 27 May 2021 10:42:46 -0000
@@ -18,22 +18,19 @@
#include <sys/socket.h>
#include <sys/tree.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
#include <netinet/in.h>
-#include <netdb.h>
+#include <arpa/inet.h>
#include <asr.h>
#include <ctype.h>
#include <err.h>
#include <errno.h>
#include <event.h>
-#include <imsg.h>
#include <limits.h>
+#include <netdb.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <strings.h>
#include <unistd.h>
#include "smtpd-defines.h"
Index: srs.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/srs.c,v
retrieving revision 1.4
diff -u -p -r1.4 srs.c
--- srs.c 26 May 2021 18:08:55 -0000 1.4
+++ srs.c 26 May 2021 19:24:59 -0000
@@ -16,30 +16,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <event.h>
-#include <imsg.h>
-#include <inttypes.h>
-#include <netdb.h>
-#include <limits.h>
-#include <pwd.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
#include <openssl/sha.h>
+#include <string.h>
#include "smtpd.h"
-#include "log.h"
static uint8_t base32[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
Index: ssl.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/ssl.c,v
retrieving revision 1.95
diff -u -p -r1.95 ssl.c
--- ssl.c 26 May 2021 07:05:50 -0000 1.95
+++ ssl.c 28 May 2021 08:02:44 -0000
@@ -18,30 +18,15 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
#include <sys/stat.h>
-#include <ctype.h>
-#include <event.h>
#include <fcntl.h>
-#include <imsg.h>
#include <limits.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <openssl/ssl.h>
#include <openssl/engine.h>
#include <openssl/err.h>
-#include <openssl/rsa.h>
-#include <openssl/ecdsa.h>
-#include <openssl/dh.h>
-#include <openssl/bn.h>
+#include <openssl/ssl.h>
+#include <string.h>
+#include <unistd.h>
#include "log.h"
#include "ssl.h"
Index: stat_backend.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/stat_backend.c,v
retrieving revision 1.11
diff -u -p -r1.11 stat_backend.c
--- stat_backend.c 27 Dec 2018 10:35:26 -0000 1.11
+++ stat_backend.c 27 May 2021 09:44:42 -0000
@@ -16,18 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-
-#include <event.h>
-#include <imsg.h>
-#include <stdio.h>
-#include <string.h>
-#include <limits.h>
-
-#include "log.h"
#include "smtpd.h"
extern struct stat_backend stat_backend_ramstat;
Index: stat_ramstat.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/stat_ramstat.c,v
retrieving revision 1.11
diff -u -p -r1.11 stat_ramstat.c
--- stat_ramstat.c 31 May 2018 21:06:12 -0000 1.11
+++ stat_ramstat.c 27 May 2021 09:44:58 -0000
@@ -16,21 +16,9 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-
-#include <event.h>
-#include <imsg.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
-#include <limits.h>
#include "smtpd.h"
-#include "log.h"
-
static void ramstat_init(void);
static void ramstat_close(void);
Index: table.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/table.c,v
retrieving revision 1.49
diff -u -p -r1.49 table.c
--- table.c 23 Dec 2020 08:12:14 -0000 1.49
+++ table.c 27 May 2021 10:39:35 -0000
@@ -17,25 +17,15 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
#include <sys/stat.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
#include <net/if.h>
+#include <arpa/inet.h>
#include <errno.h>
-#include <event.h>
-#include <imsg.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <regex.h>
-#include <limits.h>
+#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include "smtpd.h"
#include "log.h"
Index: table_db.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/table_db.c,v
retrieving revision 1.23
diff -u -p -r1.23 table_db.c
--- table_db.c 26 May 2021 18:08:55 -0000 1.23
+++ table_db.c 27 May 2021 10:39:27 -0000
@@ -16,27 +16,15 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/stat.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
#include <db.h>
-#include <ctype.h>
-#include <event.h>
#include <fcntl.h>
-#include <imsg.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "smtpd.h"
#include "log.h"
-
/* db(3) backend */
static int table_db_config(struct table *);
Index: table_getpwnam.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/table_getpwnam.c,v
retrieving revision 1.13
diff -u -p -r1.13 table_getpwnam.c
--- table_getpwnam.c 26 May 2021 18:08:55 -0000 1.13
+++ table_getpwnam.c 27 May 2021 10:52:58 -0000
@@ -16,25 +16,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-
-#include <ctype.h>
#include <errno.h>
-#include <event.h>
-#include <fcntl.h>
-#include <imsg.h>
#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <string.h>
#include "smtpd.h"
-#include "log.h"
-
/* getpwnam(3) backend */
static int table_getpwnam_config(struct table *);
Index: table_proc.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/table_proc.c,v
retrieving revision 1.16
diff -u -p -r1.16 table_proc.c
--- table_proc.c 3 Oct 2019 04:51:15 -0000 1.16
+++ table_proc.c 26 May 2021 19:20:37 -0000
@@ -16,22 +16,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-
-#include <ctype.h>
#include <errno.h>
-#include <event.h>
-#include <fcntl.h>
-#include <imsg.h>
-#include <paths.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
-#include <limits.h>
-#include <unistd.h>
#include "smtpd.h"
#include "log.h"
Index: table_static.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/table_static.c,v
retrieving revision 1.32
diff -u -p -r1.32 table_static.c
--- table_static.c 28 Dec 2018 14:21:02 -0000 1.32
+++ table_static.c 26 May 2021 19:20:00 -0000
@@ -17,23 +17,9 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
#include <ctype.h>
#include <errno.h>
-
-#include <event.h>
-#include <fcntl.h>
-#include <imsg.h>
-#include <stdio.h>
#include <stdlib.h>
-#include <limits.h>
#include <string.h>
#include "smtpd.h"
Index: to.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/to.c,v
retrieving revision 1.47
diff -u -p -r1.47 to.c
--- to.c 26 May 2021 18:08:55 -0000 1.47
+++ to.c 27 May 2021 10:39:13 -0000
@@ -18,34 +18,14 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/resource.h>
-
-#include <netinet/in.h>
#include <arpa/inet.h>
-
#include <ctype.h>
#include <errno.h>
-#include <event.h>
-#include <fcntl.h>
-#include <imsg.h>
-#include <limits.h>
-#include <inttypes.h>
-#include <netdb.h>
-#include <pwd.h>
-#include <stdarg.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
#if IO_TLS
#include <tls.h>
#endif
-#include <unistd.h>
#include "smtpd.h"
#include "log.h"
Index: tree.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/tree.c,v
retrieving revision 1.7
diff -u -p -r1.7 tree.c
--- tree.c 26 May 2021 18:08:55 -0000 1.7
+++ tree.c 26 May 2021 19:18:33 -0000
@@ -16,12 +16,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/tree.h>
#include <inttypes.h>
#include <stdlib.h>
-#include <limits.h>
#include "tree.h"
#include "log.h"
Index: unpack_dns.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/unpack_dns.c,v
retrieving revision 1.1
diff -u -p -r1.1 unpack_dns.c
--- unpack_dns.c 6 Jan 2018 07:57:53 -0000 1.1
+++ unpack_dns.c 26 May 2021 19:18:13 -0000
@@ -16,8 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <arpa/inet.h>
-
#include <string.h>
#include "unpack_dns.h"
Index: unpack_dns.h
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/unpack_dns.h,v
retrieving revision 1.1
diff -u -p -r1.1 unpack_dns.h
--- unpack_dns.h 6 Jan 2018 07:57:53 -0000 1.1
+++ unpack_dns.h 27 May 2021 10:26:52 -0000
@@ -20,7 +20,6 @@
#include <netinet/in.h>
-#include <arpa/inet.h>
#include <arpa/nameser.h>
struct unpack {
Index: util.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/util.c,v
retrieving revision 1.153
diff -u -p -r1.153 util.c
--- util.c 31 Mar 2021 19:09:19 -0000 1.153
+++ util.c 27 May 2021 10:58:04 -0000
@@ -19,34 +19,20 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/socket.h>
#include <sys/stat.h>
-#include <sys/resource.h>
#include <netinet/in.h>
-#include <arpa/inet.h>
+#include <arpa/inet.h>
#include <ctype.h>
#include <errno.h>
-#include <event.h>
-#include <fcntl.h>
#include <fts.h>
-#include <imsg.h>
-#include <inttypes.h>
#include <libgen.h>
-#include <netdb.h>
-#include <pwd.h>
-#include <limits.h>
#include <resolv.h>
#include <stdarg.h>
-#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
-#include <time.h>
#include <unistd.h>
#include "smtpd.h"
Index: waitq.c
===================================================================
RCS file: /cvs/src/usr.sbin/smtpd/waitq.c,v
retrieving revision 1.6
diff -u -p -r1.6 waitq.c
--- waitq.c 31 May 2018 21:06:12 -0000 1.6
+++ waitq.c 26 May 2021 19:08:06 -0000
@@ -16,16 +16,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <sys/uio.h>
-
-#include <imsg.h>
-#include <stdio.h>
#include <stdlib.h>
-#include <limits.h>
#include "smtpd.h"
