12 files changed, 22 insertions, 12 deletions

diff --git a/usr.sbin/apmd/apmd.c b/usr.sbin/apmd/apmd.c
index 7073dc4e80eb..2ebd557204f4 100644
--- a/usr.sbin/apmd/apmd.c
+++ b/usr.sbin/apmd/apmd.c
@@ -480,7 +480,7 @@ out:
 	return;
 }
 
-void
+int
 main(int ac, char* av[])
 {
 	int	ch;
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c
index 8d5379b8a74e..894c24968a02 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.c
+++ b/usr.sbin/kbdcontrol/kbdcontrol.c
@@ -991,7 +991,7 @@ usage()
 }
 
 
-void
+int
 main(int argc, char **argv)
 {
 	int		opt;
diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c
index 5638fd9ab9b9..1b01fdee527e 100644
--- a/usr.sbin/moused/moused.c
+++ b/usr.sbin/moused/moused.c
@@ -423,7 +423,7 @@ static void	mremote_clientchg(int add);
 
 static int kidspad(u_char rxc, mousestatus_t *act);
 
-void
+int
 main(int argc, char *argv[])
 {
     int c;
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index c17f7665f342..9af89e2b64bd 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -160,7 +160,7 @@ static	u_char zero[6];
 
 int sflag = 0;			/* ignore /tftpboot */
 
-void
+int
 main(argc, argv)
 	int argc;
 	char **argv;
diff --git a/usr.sbin/stallion/stlload/stlload.c b/usr.sbin/stallion/stlload/stlload.c
index 6d0f0303788e..163f4ff99cf3 100644
--- a/usr.sbin/stallion/stlload/stlload.c
+++ b/usr.sbin/stallion/stlload/stlload.c
@@ -423,7 +423,7 @@ int download()
 
 /*****************************************************************************/
 
-void main(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
 	struct stat	statinfo;
 	int		c;
diff --git a/usr.sbin/stallion/stlstats/stlstats.c b/usr.sbin/stallion/stlstats/stlstats.c
index 19d31612fd13..59fedbd89be8 100644
--- a/usr.sbin/stallion/stlstats/stlstats.c
+++ b/usr.sbin/stallion/stlstats/stlstats.c
@@ -497,7 +497,7 @@ void localexit(int nr)
 
 /*****************************************************************************/
 
-void main(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
 	struct stat	statinfo;
 	int		c, useport;
diff --git a/usr.sbin/watch/watch.c b/usr.sbin/watch/watch.c
index 307ffa712656..a9e262987c55 100644
--- a/usr.sbin/watch/watch.c
+++ b/usr.sbin/watch/watch.c
@@ -282,7 +282,7 @@ ask_dev(dev_name, msg)
 
 #define READB_LEN	5
 
-void
+int
 main(ac, av)
 	int             ac;
 	char          **av;
diff --git a/usr.sbin/xntpd/authstuff/md5driver.c b/usr.sbin/xntpd/authstuff/md5driver.c
index 0d7e13254f14..aef597caee44 100644
--- a/usr.sbin/xntpd/authstuff/md5driver.c
+++ b/usr.sbin/xntpd/authstuff/md5driver.c
@@ -22,6 +22,8 @@
  ***********************************************************************
  */
 
+/* $FreeBSD$ */
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <time.h>
@@ -176,7 +178,7 @@ MDTestSuite ()
     ("12345678901234567890123456789012345678901234567890123456789012345678901234567890");
 }
 
-void
+int
 main (argc, argv)
 int argc;
 char *argv[];
diff --git a/usr.sbin/xntpd/ntpdate/ntpdate.c b/usr.sbin/xntpd/ntpdate/ntpdate.c
index 608832858ff7..1d2c7d5019af 100644
--- a/usr.sbin/xntpd/ntpdate/ntpdate.c
+++ b/usr.sbin/xntpd/ntpdate/ntpdate.c
@@ -1,5 +1,7 @@
 /*
  * ntpdate - set the time of day by polling one or more NTP servers
+ *
+ * $FreeBSD$
  */
 #include <stdio.h>
 #include <signal.h>
@@ -156,7 +158,7 @@ static	void	printserver	P((struct server *, FILE *));
  * Main program.  Initialize us and loop waiting for I/O and/or
  * timer expiries.
  */
-void
+int
 main(argc, argv)
 	int argc;
 	char *argv[];
diff --git a/usr.sbin/xntpd/ntpq/ntpq.c b/usr.sbin/xntpd/ntpq/ntpq.c
index 2c5eacf32705..186408aa1303 100644
--- a/usr.sbin/xntpd/ntpq/ntpq.c
+++ b/usr.sbin/xntpd/ntpq/ntpq.c
@@ -1,5 +1,7 @@
 /*
  * ntpq - query an NTP server using mode 6 commands
+ *
+ * $FreeBSD$
  */
 #include <stdio.h>
 #include <ctype.h>
@@ -512,7 +514,7 @@ int debug;
 /*
  * main - parse arguments and handle options
  */
-void
+int
 main(argc, argv)
 int argc;
 char *argv[];
diff --git a/usr.sbin/xntpd/ntptrace/ntptrace.c b/usr.sbin/xntpd/ntptrace/ntptrace.c
index 206c73861709..0c54fdff2b43 100644
--- a/usr.sbin/xntpd/ntptrace/ntptrace.c
+++ b/usr.sbin/xntpd/ntptrace/ntptrace.c
@@ -7,6 +7,8 @@
  *	Inspired by a script written by Glenn Trewitt
  *
  *	Large portions stolen from ntpdate.c
+ *
+ * $FreeBSD$
  */
 #include <stdio.h>
 #include <signal.h>
@@ -103,7 +105,7 @@ static	void	printrefid	P((FILE *, struct server *));
  * Main program.  Initialize us and loop waiting for I/O and/or
  * timer expiries.
  */
-void
+int
 main(argc, argv)
 	int argc;
 	char *argv[];
diff --git a/usr.sbin/xntpd/xntpd/ntpd.c b/usr.sbin/xntpd/xntpd/ntpd.c
index ae06f56582bb..bd3600442d01 100644
--- a/usr.sbin/xntpd/xntpd/ntpd.c
+++ b/usr.sbin/xntpd/xntpd/ntpd.c
@@ -1,5 +1,7 @@
 /*
  * ntpd.c - main program for the fixed point NTP daemon
+ *
+ * $FreeBSD$
  */
 #include <stdio.h>
 #include <errno.h>
@@ -95,7 +97,7 @@ static	RETSIGTYPE	lessdebug	P((int));
  * Main program.  Initialize us, disconnect us from the tty if necessary,
  * and loop waiting for I/O and/or timer expiries.
  */
-void
+int
 main(argc, argv)
 	int argc;
 	char *argv[];