From 862852cd7296d181cf51145cd9e0c929d5810d9b Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Sun, 10 May 2009 17:27:15 +0200
Subject: [PATCH] mrouted(8): Raise WARNS to 1 and fix two warnings.

---
 usr.sbin/mrouted/Makefile.inc | 2 ++
 usr.sbin/mrouted/kern.c       | 3 +--
 usr.sbin/mrouted/main.c       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/usr.sbin/mrouted/Makefile.inc b/usr.sbin/mrouted/Makefile.inc
index 99c55efd13..14ac8f7fa6 100644
--- a/usr.sbin/mrouted/Makefile.inc
+++ b/usr.sbin/mrouted/Makefile.inc
@@ -1,6 +1,8 @@
 # $FreeBSD: src/usr.sbin/mrouted/Makefile.inc,v 1.4 1999/08/28 01:17:02 peter Exp $
 # $DragonFly: src/usr.sbin/mrouted/Makefile.inc,v 1.2 2003/06/17 04:29:57 dillon Exp $
 
+WARNS?=	      1
+
 CFLAGS+=	-DRSRR
 
 .if exists(${.OBJDIR}/../common)
diff --git a/usr.sbin/mrouted/kern.c b/usr.sbin/mrouted/kern.c
index 1a4227a95d..174175ee78 100644
--- a/usr.sbin/mrouted/kern.c
+++ b/usr.sbin/mrouted/kern.c
@@ -209,8 +209,7 @@ k_add_rg(u_int32 origin, struct gtable *g)
 #ifdef DEBUG_MFC
 	md_log(MD_ADD_FAIL, origin, g->gt_mcastgrp);
 #endif
-	dolog(LOG_WARNING, errno, "setsockopt MRT_ADD_MFC",
-		inet_fmt(origin, s1), inet_fmt(g->gt_mcastgrp, s2));
+	dolog(LOG_WARNING, errno, "setsockopt MRT_ADD_MFC");
     }
 }
 
diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c
index 1e61d1f912..8be7886fee 100644
--- a/usr.sbin/mrouted/main.c
+++ b/usr.sbin/mrouted/main.c
@@ -696,7 +696,7 @@ timer(void *i)
 static void
 cleanup(void)
 {
-    static in_cleanup = 0;
+    static int in_cleanup = 0;
 
     if (!in_cleanup) {
 	in_cleanup++;
-- 
2.11.4.GIT