Sync with KAME. Format string auditing and manpage cleanups.

Obtained from:	KAME
Submitted by:	Bill Sommerfeld <sommerfeld@netbsd.org>

2 files changed, 10 insertions, 7 deletions

diff --git a/usr.sbin/route6d/route6d.8 b/usr.sbin/route6d/route6d.8
index 1457878..72136ed 100644
--- a/usr.sbin/route6d/route6d.8
+++ b/usr.sbin/route6d/route6d.8
@@ -58,7 +58,7 @@ Enables aging of the statically defined routes.
 With this option, any
 statically defined routes will be removed unless corresponding updates
 arrive as if the routes are received at the startup of
-.Nm route6d .
+.Nm Ns .
 .\"
 .It Fl R Ar routelog
 This option makes the
@@ -221,7 +221,7 @@ or
 .Re
 .\"
 .Sh NOTE
-.Nm Route6d
+.Nm
 uses IPv6 advanced API,
 defined in RFC2292,
 for communicating with peers using link-local addresses.
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index 102c1ff..b5a91a9 100644
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -253,9 +253,12 @@ struct in6_addr *plen2mask __P((int));
 struct riprt *rtsearch __P((struct netinfo6 *));
 int ripinterval __P((int));
 time_t ripsuptrig __P((void));
-void fatal __P((const char *, ...));
-void trace __P((int, const char *, ...));
-void tracet __P((int, const char *, ...));
+void fatal __P((const char *, ...))
+	__attribute__((__format__(__printf__, 1, 2)));
+void trace __P((int, const char *, ...))
+	__attribute__((__format__(__printf__, 2, 3)));
+void tracet __P((int, const char *, ...))
+	__attribute__((__format__(__printf__, 2, 3)));
 unsigned int if_maxindex __P((void));
 struct ifc *ifc_find __P((char *));
 struct iff *iff_find __P((struct ifc *, int));
@@ -530,7 +533,7 @@ init()
 	hints.ai_flags = AI_PASSIVE;
 	error = getaddrinfo(NULL, port, &hints, &res);
 	if (error)
-		fatal(gai_strerror(error));
+		fatal("%s", gai_strerror(error));
 	if (res->ai_next)
 		fatal(":: resolved to multiple address");
 
@@ -563,7 +566,7 @@ init()
 	hints.ai_socktype = SOCK_DGRAM;
 	error = getaddrinfo(RIP6_DEST, port, &hints, &res);
 	if (error)
-		fatal(gai_strerror(error));
+		fatal("%s", gai_strerror(error));
 	if (res->ai_next)
 		fatal("%s resolved to multiple address", RIP6_DEST);
 	memcpy(&ripsin, res->ai_addr, res->ai_addrlen);