summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2021-12-13 18:28:41 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2021-12-13 18:28:41 +0000
commited2ef8648646136913e278108edd41ea3ef74877 (patch)
tree80b19360c11185c64bed283b1f44c545ceb0ff9f /usr.sbin
parented22057d9feaccfbd82b72ed735453415eb5ba6b (diff)
including sys/cdefs.h manually started as a result of netbsd trying to
macro-build a replacement for sccsid, and was done without any concern for namespace damage. Unfortunately this practice started infecting other code as others were unaware they didn't need the file. ok millert guenther
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/dhcpd/log.h3
-rw-r--r--usr.sbin/dhcrelay/log.h3
-rw-r--r--usr.sbin/dhcrelay6/log.h3
-rw-r--r--usr.sbin/dvmrpd/log.h3
-rw-r--r--usr.sbin/eigrpd/log.h3
-rw-r--r--usr.sbin/ifstated/log.h3
-rw-r--r--usr.sbin/iscsid/log.h3
-rw-r--r--usr.sbin/ldapd/log.h3
-rw-r--r--usr.sbin/lpd/log.h3
-rw-r--r--usr.sbin/ntpd/log.h3
-rw-r--r--usr.sbin/ospf6d/log.h3
-rw-r--r--usr.sbin/ospfd/log.h3
-rw-r--r--usr.sbin/rad/log.h3
-rw-r--r--usr.sbin/radiusd/imsg_subr.h3
-rw-r--r--usr.sbin/radiusd/log.h3
-rw-r--r--usr.sbin/radiusd/radiusd_module.h1
-rw-r--r--usr.sbin/radiusd/util.h3
-rw-r--r--usr.sbin/ripd/log.h3
-rw-r--r--usr.sbin/smtpd/log.h3
-rw-r--r--usr.sbin/syslogd/log.h4
-rw-r--r--usr.sbin/vmd/vmd.c3
21 files changed, 20 insertions, 42 deletions
diff --git a/usr.sbin/dhcpd/log.h b/usr.sbin/dhcpd/log.h
index ff240f3f624..0fa046fc3af 100644
--- a/usr.sbin/dhcpd/log.h
+++ b/usr.sbin/dhcpd/log.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.h,v 1.1 2017/02/13 19:13:14 krw Exp $ */
+/* $OpenBSD: log.h,v 1.2 2021/12/13 18:28:40 deraadt Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -20,7 +20,6 @@
#define LOG_H
#include <stdarg.h>
-#include <sys/cdefs.h>
void log_init(int, int);
void log_procinit(const char *);
diff --git a/usr.sbin/dhcrelay/log.h b/usr.sbin/dhcrelay/log.h
index 51ebf6eee83..0fa046fc3af 100644
--- a/usr.sbin/dhcrelay/log.h
+++ b/usr.sbin/dhcrelay/log.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.h,v 1.1 2017/02/13 19:15:39 krw Exp $ */
+/* $OpenBSD: log.h,v 1.2 2021/12/13 18:28:40 deraadt Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -20,7 +20,6 @@
#define LOG_H
#include <stdarg.h>
-#include <sys/cdefs.h>
void log_init(int, int);
void log_procinit(const char *);
diff --git a/usr.sbin/dhcrelay6/log.h b/usr.sbin/dhcrelay6/log.h
index ccb75bbc711..e18f3fa3967 100644
--- a/usr.sbin/dhcrelay6/log.h
+++ b/usr.sbin/dhcrelay6/log.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.h,v 1.1 2017/03/17 14:45:16 rzalamena Exp $ */
+/* $OpenBSD: log.h,v 1.2 2021/12/13 18:28:40 deraadt Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -20,7 +20,6 @@
#define LOG_H
#include <stdarg.h>
-#include <sys/cdefs.h>
void log_init(int, int);
void log_procinit(const char *);
diff --git a/usr.sbin/dvmrpd/log.h b/usr.sbin/dvmrpd/log.h
index fcf54d924e1..03461db1499 100644
--- a/usr.sbin/dvmrpd/log.h
+++ b/usr.sbin/dvmrpd/log.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.h,v 1.4 2016/09/02 16:20:34 benno Exp $ */
+/* $OpenBSD: log.h,v 1.5 2021/12/13 18:28:40 deraadt Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -20,7 +20,6 @@
#define LOG_H
#include <stdarg.h>
-#include <sys/cdefs.h>
extern const char *log_procname;
diff --git a/usr.sbin/eigrpd/log.h b/usr.sbin/eigrpd/log.h
index 62824abd4c4..876cecb6946 100644
--- a/usr.sbin/eigrpd/log.h
+++ b/usr.sbin/eigrpd/log.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.h,v 1.5 2016/09/02 17:59:58 benno Exp $ */
+/* $OpenBSD: log.h,v 1.6 2021/12/13 18:28:40 deraadt Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -20,7 +20,6 @@
#define LOG_H
#include <stdarg.h>
-#include <sys/cdefs.h>
extern const char *log_procname;
diff --git a/usr.sbin/ifstated/log.h b/usr.sbin/ifstated/log.h
index 112f2e9909f..0fa046fc3af 100644
--- a/usr.sbin/ifstated/log.h
+++ b/usr.sbin/ifstated/log.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.h,v 1.1 2017/06/18 12:03:47 benno Exp $ */
+/* $OpenBSD: log.h,v 1.2 2021/12/13 18:28:40 deraadt Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -20,7 +20,6 @@
#define LOG_H
#include <stdarg.h>
-#include <sys/cdefs.h>
void log_init(int, int);
void log_procinit(const char *);
diff --git a/usr.sbin/iscsid/log.h b/usr.sbin/iscsid/log.h
index abd99848a7c..acd5d2f96e9 100644
--- a/usr.sbin/iscsid/log.h
+++ b/usr.sbin/iscsid/log.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.h,v 1.5 2017/01/23 08:40:07 benno Exp $ */
+/* $OpenBSD: log.h,v 1.6 2021/12/13 18:28:40 deraadt Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -20,7 +20,6 @@
#define LOG_H
#include <stdarg.h>
-#include <sys/cdefs.h>
extern const char *log_procname;
diff --git a/usr.sbin/ldapd/log.h b/usr.sbin/ldapd/log.h
index d711a3d3e1f..eba62fc5d0f 100644
--- a/usr.sbin/ldapd/log.h
+++ b/usr.sbin/ldapd/log.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.h,v 1.2 2018/05/15 11:19:21 reyk Exp $ */
+/* $OpenBSD: log.h,v 1.3 2021/12/13 18:28:40 deraadt Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -17,7 +17,6 @@
*/
#include <stdarg.h>
-#include <sys/cdefs.h>
void log_init(int, int);
void log_procinit(const char *);
diff --git a/usr.sbin/lpd/log.h b/usr.sbin/lpd/log.h
index dce0af827c4..ff0e86298a3 100644
--- a/usr.sbin/lpd/log.h
+++ b/usr.sbin/lpd/log.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.h,v 1.1 2018/04/27 16:14:36 eric Exp $ */
+/* $OpenBSD: log.h,v 1.2 2021/12/13 18:28:40 deraadt Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -20,7 +20,6 @@
#define LOG_H
#include <stdarg.h>
-#include <sys/cdefs.h>
void log_init(int, int);
void log_procinit(const char *);
diff --git a/usr.sbin/ntpd/log.h b/usr.sbin/ntpd/log.h
index c3221c373e5..5d7a6926cd7 100644
--- a/usr.sbin/ntpd/log.h
+++ b/usr.sbin/ntpd/log.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.h,v 1.5 2019/06/27 15:18:42 otto Exp $ */
+/* $OpenBSD: log.h,v 1.6 2021/12/13 18:28:40 deraadt Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -20,7 +20,6 @@
#define LOG_H
#include <stdarg.h>
-#include <sys/cdefs.h>
#define LOG_TO_STDERR (1<<0)
#define LOG_TO_SYSLOG (1<<1)
diff --git a/usr.sbin/ospf6d/log.h b/usr.sbin/ospf6d/log.h
index a29cc7d7adc..ef167167ced 100644
--- a/usr.sbin/ospf6d/log.h
+++ b/usr.sbin/ospf6d/log.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.h,v 1.12 2017/08/12 16:27:50 benno Exp $ */
+/* $OpenBSD: log.h,v 1.13 2021/12/13 18:28:40 deraadt Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -20,7 +20,6 @@
#define LOG_H
#include <stdarg.h>
-#include <sys/cdefs.h>
void log_init(int, int);
void log_procinit(const char *);
diff --git a/usr.sbin/ospfd/log.h b/usr.sbin/ospfd/log.h
index 8bba62975c1..c3b4bb3cb9f 100644
--- a/usr.sbin/ospfd/log.h
+++ b/usr.sbin/ospfd/log.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.h,v 1.10 2017/01/24 04:24:25 benno Exp $ */
+/* $OpenBSD: log.h,v 1.11 2021/12/13 18:28:40 deraadt Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -20,7 +20,6 @@
#define LOG_H
#include <stdarg.h>
-#include <sys/cdefs.h>
void log_init(int, int);
void log_procinit(const char *);
diff --git a/usr.sbin/rad/log.h b/usr.sbin/rad/log.h
index 317b3314f7a..0fa046fc3af 100644
--- a/usr.sbin/rad/log.h
+++ b/usr.sbin/rad/log.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.h,v 1.1 2018/07/10 16:39:54 florian Exp $ */
+/* $OpenBSD: log.h,v 1.2 2021/12/13 18:28:40 deraadt Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -20,7 +20,6 @@
#define LOG_H
#include <stdarg.h>
-#include <sys/cdefs.h>
void log_init(int, int);
void log_procinit(const char *);
diff --git a/usr.sbin/radiusd/imsg_subr.h b/usr.sbin/radiusd/imsg_subr.h
index 01580c4145b..653e63b1ca5 100644
--- a/usr.sbin/radiusd/imsg_subr.h
+++ b/usr.sbin/radiusd/imsg_subr.h
@@ -1,11 +1,10 @@
-/* $OpenBSD: imsg_subr.h,v 1.1 2015/07/21 04:06:04 yasuoka Exp $ */
+/* $OpenBSD: imsg_subr.h,v 1.2 2021/12/13 18:28:40 deraadt Exp $ */
#ifndef _IMSG_SUBR_H
#define _IMSG_SUBR_H
struct imsgbuf;
-#include <sys/cdefs.h>
__BEGIN_DECLS
int imsg_sync_read(struct imsgbuf *, int);
diff --git a/usr.sbin/radiusd/log.h b/usr.sbin/radiusd/log.h
index 66f1e80db82..84929aec4bb 100644
--- a/usr.sbin/radiusd/log.h
+++ b/usr.sbin/radiusd/log.h
@@ -1,9 +1,8 @@
-/* $OpenBSD: log.h,v 1.2 2019/03/31 03:53:42 yasuoka Exp $ */
+/* $OpenBSD: log.h,v 1.3 2021/12/13 18:28:40 deraadt Exp $ */
#ifndef _LOG_H
#define _LOG_H 1
-#include <sys/cdefs.h>
#include <stdarg.h> /* for va_list */
extern int log_debug_use_syslog;
diff --git a/usr.sbin/radiusd/radiusd_module.h b/usr.sbin/radiusd/radiusd_module.h
index 9884e57b3a7..647cfcf7e6a 100644
--- a/usr.sbin/radiusd/radiusd_module.h
+++ b/usr.sbin/radiusd/radiusd_module.h
@@ -46,7 +46,6 @@ struct module_handlers {
goto syntax_error; \
} \
} while (0 /* CONSTCOND */)
-#include <sys/cdefs.h>
__BEGIN_DECLS
diff --git a/usr.sbin/radiusd/util.h b/usr.sbin/radiusd/util.h
index bc6103bb13f..e25dae4f7d4 100644
--- a/usr.sbin/radiusd/util.h
+++ b/usr.sbin/radiusd/util.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.h,v 1.2 2015/08/27 01:02:35 yasuoka Exp $ */
+/* $OpenBSD: util.h,v 1.3 2021/12/13 18:28:40 deraadt Exp $ */
#ifndef RADIUSD_UTIL_H
#define RADIUSD_UTIL_H
@@ -20,7 +20,6 @@
#include <sys/socket.h> /* for struct sockaddr */
#include <netdb.h> /* for struct addrinfo */
-#include <sys/cdefs.h>
__BEGIN_DECLS
diff --git a/usr.sbin/ripd/log.h b/usr.sbin/ripd/log.h
index 9250fab7965..a1392ce5966 100644
--- a/usr.sbin/ripd/log.h
+++ b/usr.sbin/ripd/log.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.h,v 1.6 2016/09/02 14:07:52 benno Exp $ */
+/* $OpenBSD: log.h,v 1.7 2021/12/13 18:28:40 deraadt Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -20,7 +20,6 @@
#define LOG_H
#include <stdarg.h>
-#include <sys/cdefs.h>
extern const char *log_procname;
diff --git a/usr.sbin/smtpd/log.h b/usr.sbin/smtpd/log.h
index 22bb4164394..66db31ff29b 100644
--- a/usr.sbin/smtpd/log.h
+++ b/usr.sbin/smtpd/log.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.h,v 1.8 2018/04/26 20:57:59 eric Exp $ */
+/* $OpenBSD: log.h,v 1.9 2021/12/13 18:28:40 deraadt Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -20,7 +20,6 @@
#define LOG_H
#include <stdarg.h>
-#include <sys/cdefs.h>
void log_init(int, int);
void log_procinit(const char *);
diff --git a/usr.sbin/syslogd/log.h b/usr.sbin/syslogd/log.h
index c7c6c9bbe3e..45b045e1395 100644
--- a/usr.sbin/syslogd/log.h
+++ b/usr.sbin/syslogd/log.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.h,v 1.3 2017/04/28 14:52:13 bluhm Exp $ */
+/* $OpenBSD: log.h,v 1.4 2021/12/13 18:28:40 deraadt Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -20,8 +20,6 @@
#ifndef LOG_H
#define LOG_H
-#include <sys/cdefs.h>
-
#include <stdarg.h>
void log_init(int, int);
diff --git a/usr.sbin/vmd/vmd.c b/usr.sbin/vmd/vmd.c
index f2c419f12d2..9407c0f399b 100644
--- a/usr.sbin/vmd/vmd.c
+++ b/usr.sbin/vmd/vmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmd.c,v 1.127 2021/11/29 05:17:35 deraadt Exp $ */
+/* $OpenBSD: vmd.c,v 1.128 2021/12/13 18:28:40 deraadt Exp $ */
/*
* Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -19,7 +19,6 @@
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/wait.h>
-#include <sys/cdefs.h>
#include <sys/stat.h>
#include <sys/sysctl.h>
#include <sys/tty.h>