The last big commit: let usr.sbin/ use WARNS=6 by default.

HardenedBSD · Jan 2, 2010 · 71ccf09 · 71ccf09
1 parent 1fa2ff1
commit 71ccf09
Show file tree

Hide file tree

Showing 163 changed files with 157 additions and 137 deletions.
diff --git a/usr.sbin/Makefile.inc b/usr.sbin/Makefile.inc
@@ -2,3 +2,5 @@
 # $FreeBSD$
 
 BINDIR?=	/usr/sbin
+
+WARNS?=		6
diff --git a/usr.sbin/ac/Makefile b/usr.sbin/ac/Makefile
@@ -3,8 +3,6 @@
 PROG=	ac
 MAN=	ac.8
 
-WARNS?=	4
-
 # Temporary, while tracking down problem wrt 64-bit time_t's on sparc64
 .if ${MACHINE_ARCH} == "sparc64"
 CFLAGS+=-DDEBUG

diff --git a/usr.sbin/accton/Makefile b/usr.sbin/accton/Makefile
@@ -4,6 +4,4 @@
 PROG=	accton
 MAN=	accton.8
 
-WARNS?=	4
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/acpi/acpiconf/Makefile b/usr.sbin/acpi/acpiconf/Makefile
@@ -3,6 +3,5 @@
 
 PROG=	acpiconf
 MAN=	acpiconf.8
-WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/acpi/acpidump/Makefile b/usr.sbin/acpi/acpidump/Makefile
@@ -3,6 +3,5 @@
 PROG=	acpidump
 MAN=	acpidump.8
 SRCS=	acpi.c acpi_user.c acpidump.c
-WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile
@@ -50,6 +50,8 @@ SRCS+=	utalloc.c utcache.c utcopy.c utdebug.c utdelete.c	\
 	utglobal.c utinit.c utlock.c utmath.c utmisc.c		\
 	utmutex.c utobject.c utresrc.c utstate.c utxface.c
 
+WARNS?=	2
+
 MAN=	iasl.8
 
 CFLAGS+= -DACPI_ASL_COMPILER -I.

diff --git a/usr.sbin/amd/Makefile.inc b/usr.sbin/amd/Makefile.inc
@@ -40,6 +40,8 @@ RPCCOM=		rpcgen
 MOUNT_X=	${DESTDIR}/usr/include/rpcsvc/mount.x
 NFS_PROT_X=	${DESTDIR}/usr/include/rpcsvc/nfs_prot.x
 
+WARNS?=	1
+
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
 .endif
diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile
@@ -4,6 +4,5 @@ PROG=	apm
 MAN=	apm.8
 MLINKS=	apm.8 apmconf.8
 MANSUBDIR= /${MACHINE_ARCH}
-WARNS?=	6
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile
@@ -5,6 +5,8 @@ MAN=	apmd.8
 MANSUBDIR= /i386
 SRCS=	apmd.c apmdlex.l apmdparse.y y.tab.h
 
+WARNS?=	0
+
 DPADD=	${LIBL}
 LDADD=	-ll
 

diff --git a/usr.sbin/asf/Makefile b/usr.sbin/asf/Makefile
@@ -7,6 +7,4 @@ MAN=	asf.8
 DPADD=	${LIBKVM}
 LDADD=	-lkvm
 
-WARNS?=	4
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/audit/Makefile b/usr.sbin/audit/Makefile
@@ -13,4 +13,6 @@ MAN=	audit.8
 DPADD=	${LIBBSM}
 LDADD=	-lbsm
 
+WARNS?=	5
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/auditd/Makefile b/usr.sbin/auditd/Makefile
@@ -14,4 +14,6 @@ MAN=	auditd.8
 DPADD=	${LIBBSM} ${LIBAUDITD}
 LDADD=	-lbsm -lauditd
 
+WARNS?=	3
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/auditreduce/Makefile b/usr.sbin/auditreduce/Makefile
@@ -13,4 +13,6 @@ MAN=	auditreduce.1
 DPADD=	${LIBBSM}
 LDADD=	-lbsm
 
+WARNS?=	3
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/authpf/Makefile b/usr.sbin/authpf/Makefile
@@ -19,4 +19,6 @@ CFLAGS+= -DENABLE_ALTQ
 LDADD+= -lm -lmd -lutil
 DPADD+= ${LIBM} ${LIBMD} ${LIBUTIL}
 
+WARNS?=	3
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/boot0cfg/Makefile b/usr.sbin/boot0cfg/Makefile
@@ -3,8 +3,6 @@
 PROG=	boot0cfg
 MAN=	boot0cfg.8
 
-WARNS?=	2
-
 DPADD=	${LIBGEOM}
 LDADD=	-lgeom
 

diff --git a/usr.sbin/bootparamd/Makefile.inc b/usr.sbin/bootparamd/Makefile.inc
@@ -2,3 +2,5 @@
 # $FreeBSD$
 
 BINDIR?=	/usr/sbin
+
+WARNS?=		2
diff --git a/usr.sbin/bsnmpd/bsnmpd/Makefile b/usr.sbin/bsnmpd/bsnmpd/Makefile
@@ -14,7 +14,6 @@ XSYM=	snmpMIB begemotSnmpdModuleTable begemotSnmpd begemotTrapSinkTable \
 	freeBSDVersion
 CLEANFILES= oid.h tree.c tree.h
 MAN=	bsnmpd.1 snmpmod.3
-WARNS?=	6
 NO_WERROR=
 
 FILESGROUPS= BMIBS DEFS

diff --git a/usr.sbin/bsnmpd/gensnmptree/Makefile b/usr.sbin/bsnmpd/gensnmptree/Makefile
@@ -10,4 +10,6 @@ CFLAGS+= -I${CONTRIB}/lib
 CFLAGS+= -DQUADFMT='"llu"' -DQUADXFMT='"llx"' -DHAVE_STDINT_H
 CFLAGS+= -DHAVE_INTTYPES_H
 
+WARNS?=	5
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
@@ -4,7 +4,6 @@
 
 MOD=	pf
 SRCS=	pf_snmp.c
-WARNS?=	6
 
 XSYM=	begemotPf
 DEFS=	${MOD}_tree.def

diff --git a/usr.sbin/btxld/Makefile b/usr.sbin/btxld/Makefile
@@ -4,6 +4,4 @@ PROG=	btxld
 MAN=	btxld.8
 SRCS=	btxld.c elfh.c
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/burncd/Makefile b/usr.sbin/burncd/Makefile
@@ -3,6 +3,4 @@
 PROG=	burncd
 MAN=	burncd.8
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/cdcontrol/Makefile b/usr.sbin/cdcontrol/Makefile
@@ -2,7 +2,7 @@
 
 PROG= cdcontrol
 
-WARNS?= 2
+WARNS?= 3
 
 DPADD=	${LIBEDIT} ${LIBTERMCAP}
 LDADD=	-ledit -ltermcap

diff --git a/usr.sbin/chkgrp/Makefile b/usr.sbin/chkgrp/Makefile
@@ -3,6 +3,4 @@
 PROG=	chkgrp
 MAN=	chkgrp.8
 
-WARNS?=	2
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/chown/Makefile b/usr.sbin/chown/Makefile
@@ -5,6 +5,4 @@ PROG=	chown
 LINKS=	${BINDIR}/chown /usr/bin/chgrp
 MAN=	chgrp.1 chown.8
 
-WARNS?=	5
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/chroot/Makefile b/usr.sbin/chroot/Makefile
@@ -4,6 +4,4 @@
 PROG=	chroot
 MAN=	chroot.8
 
-WARNS?=	2
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/clear_locks/Makefile b/usr.sbin/clear_locks/Makefile
@@ -4,6 +4,5 @@ PROG=	clear_locks
 MAN=	clear_locks.8
 DPADD=	${LIBRPCSVC}
 LDADD=	-lrpcsvc
-WARNS=	6
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile
@@ -9,7 +9,6 @@ SRCS=	config.y main.c lang.l mkmakefile.c mkheaders.c \
 kernconf.c: kernconf.tmpl
 	file2c 'char kernconfstr[] = {' ',0};' < ${.CURDIR}/kernconf.tmpl > kernconf.c
 
-WARNS?=	6
 CFLAGS+= -I. -I${.CURDIR}
 
 DPADD=	${LIBL} ${LIBSBUF}

diff --git a/usr.sbin/cpucontrol/Makefile b/usr.sbin/cpucontrol/Makefile
@@ -4,6 +4,4 @@ PROG=	cpucontrol
 MAN=	cpucontrol.8
 SRCS=	cpucontrol.c intel.c amd.c
 
-WARNS?=	6
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/cron/cron/Makefile b/usr.sbin/cron/cron/Makefile
@@ -9,4 +9,6 @@ CFLAGS+= -DLOGIN_CAP -DPAM
 DPADD=	${LIBCRON} ${LIBPAM} ${LIBUTIL}
 LDADD=	${LIBCRON} ${MINUSLPAM} -lutil
 
+WARNS?=	2
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/crunch/Makefile.inc b/usr.sbin/crunch/Makefile.inc
@@ -2,3 +2,5 @@
 
 # modify to taste
 BINDIR?= /usr/bin
+
+WARNS?=	2
diff --git a/usr.sbin/ctm/ctm/Makefile b/usr.sbin/ctm/ctm/Makefile
@@ -17,6 +17,8 @@ NOTYET=	ctm_ed.c
 LDADD=	-lmd
 DPADD=	${LIBMD}
 
+WARNS?=	2
+
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
 .endif

diff --git a/usr.sbin/ctm/ctm_dequeue/Makefile b/usr.sbin/ctm/ctm_dequeue/Makefile
@@ -8,4 +8,6 @@ SRCS=	ctm_dequeue.c error.c
 
 CFLAGS+= -I${.CURDIR}/../ctm_rmail
 
+WARNS?=	1
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ctm/ctm_rmail/Makefile b/usr.sbin/ctm/ctm_rmail/Makefile
@@ -5,4 +5,6 @@ MLINKS=	ctm_rmail.1 ctm_smail.1 \
 	ctm_rmail.1 ctm_dequeue.1
 SRCS=	ctm_rmail.c error.c
 
+WARNS?=	2
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ctm/ctm_smail/Makefile b/usr.sbin/ctm/ctm_smail/Makefile
@@ -8,4 +8,6 @@ SRCS=	ctm_smail.c error.c
 
 CFLAGS+= -I${.CURDIR}/../ctm_rmail
 
+WARNS?=	2
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/daemon/Makefile b/usr.sbin/daemon/Makefile
@@ -6,6 +6,4 @@ MAN=	daemon.8
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 
-WARNS?=	2
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/dconschat/Makefile b/usr.sbin/dconschat/Makefile
@@ -8,4 +8,6 @@ CFLAGS+= -I${.CURDIR}/../../sys
 DPADD=  ${LIBKVM}
 LDADD=  -lkvm
 
+WARNS?=	1
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/devinfo/Makefile b/usr.sbin/devinfo/Makefile
@@ -3,8 +3,6 @@
 PROG=	devinfo
 MAN=	devinfo.8
 
-WARNS?=	2
-
 DPADD=	${LIBDEVINFO}
 LDADD=	-ldevinfo
 

diff --git a/usr.sbin/digictl/Makefile b/usr.sbin/digictl/Makefile
@@ -3,6 +3,4 @@
 PROG=	digictl
 MAN=	digictl.8
 
-WARNS?=	2
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/diskinfo/Makefile b/usr.sbin/diskinfo/Makefile
@@ -3,8 +3,6 @@
 PROG=	diskinfo
 MAN=	diskinfo.8
 
-WARNS?=	5
-
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 

diff --git a/usr.sbin/dnssec-dsfromkey/Makefile b/usr.sbin/dnssec-dsfromkey/Makefile
@@ -17,6 +17,8 @@ CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/include
 DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
 
+WARNS?=		3
+
 MAN=		dnssec-dsfromkey.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/dnssec-keyfromlabel/Makefile b/usr.sbin/dnssec-keyfromlabel/Makefile
@@ -17,6 +17,8 @@ CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/include
 DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
 
+WARNS?=		3
+
 MAN=		dnssec-keyfromlabel.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/dnssec-keygen/Makefile b/usr.sbin/dnssec-keygen/Makefile
@@ -17,6 +17,8 @@ CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/include
 DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
 
+WARNS?=		3
+
 MAN=		dnssec-keygen.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/dnssec-signzone/Makefile b/usr.sbin/dnssec-signzone/Makefile
@@ -17,6 +17,8 @@ CFLAGS+=	-I${SRCDIR}/unix/include -I${SRCDIR}/include
 DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
 
+WARNS?=		3
+
 MAN=		dnssec-signzone.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/dumpcis/Makefile b/usr.sbin/dumpcis/Makefile
@@ -5,6 +5,5 @@
 PROG=	dumpcis
 MAN=	dumpcis.8
 SRCS=	main.c readcis.c printcis.c
-WARNS?=	5
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/editmap/Makefile b/usr.sbin/editmap/Makefile
@@ -10,6 +10,8 @@ MAN=	editmap.8
 CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
 CFLAGS+= -DNEWDB -DNOT_SENDMAIL
 
+WARNS?=	2
+
 LIBSMDIR=	${.OBJDIR}/../../lib/libsm
 LIBSM=		${LIBSMDIR}/libsm.a
 

diff --git a/usr.sbin/edquota/Makefile b/usr.sbin/edquota/Makefile
@@ -4,6 +4,4 @@
 PROG=	edquota
 MAN=	edquota.8
 
-WARNS?=	4
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/eeprom/Makefile b/usr.sbin/eeprom/Makefile
@@ -6,7 +6,6 @@ PROG=	eeprom
 MAN=	eeprom.8
 MANSUBDIR= /sparc64
 SRCS=	eeprom.c ofw_options.c ofw_util.c
-WARNS?=	6
 CFLAGS+= -I${.CURDIR}/../ofwdump
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/extattr/Makefile b/usr.sbin/extattr/Makefile
@@ -11,6 +11,4 @@ MLINKS+=	rmextattr.8 setextattr.8
 MLINKS+=	rmextattr.8 getextattr.8
 MLINKS+=	rmextattr.8 lsextattr.8
 
-WARNS?=	5
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/extattrctl/Makefile b/usr.sbin/extattrctl/Makefile
@@ -3,6 +3,4 @@
 PROG=	extattrctl
 MAN=	extattrctl.8
 
-WARNS?=	2
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/faithd/Makefile b/usr.sbin/faithd/Makefile
@@ -20,4 +20,6 @@ SRCS=	faithd.c tcp.c ftp.c prefix.c
 
 CFLAGS+= -DHAVE_POLL_H
 
+WARNS?=	2
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/fdcontrol/Makefile b/usr.sbin/fdcontrol/Makefile
@@ -4,7 +4,6 @@
 
 PROG=	fdcontrol
 SRCS=	fdcontrol.c fdutil.c
-WARNS?=	6
 CFLAGS+= -I${.CURDIR}/../fdread
 MAN=	fdcontrol.8
 

diff --git a/usr.sbin/fdformat/Makefile b/usr.sbin/fdformat/Makefile
@@ -5,7 +5,6 @@
 PROG=	fdformat
 SRCS=	fdformat.c fdutil.c
 
-WARNS?=	6
 CFLAGS+= -I${.CURDIR}/../fdread
 
 .if ${MACHINE} == "pc98"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,5 @@
		# $FreeBSD$

		BINDIR?= /usr/sbin

		WARNS?= 6
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,5 @@

		# modify to taste
		BINDIR?= /usr/bin

		WARNS?= 2
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,6 @@ SRCS= ctm_dequeue.c error.c

		CFLAGS+= -I${.CURDIR}/../ctm_rmail

		WARNS?= 1

		.include <bsd.prog.mk>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,6 @@ SRCS= ctm_smail.c error.c

		CFLAGS+= -I${.CURDIR}/../ctm_rmail

		WARNS?= 2

		.include <bsd.prog.mk>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,4 +20,6 @@ SRCS= faithd.c tcp.c ftp.c prefix.c

		CFLAGS+= -DHAVE_POLL_H

		WARNS?= 2

		.include <bsd.prog.mk>