Resolve conflicts.

4 files changed, 9 insertions, 4 deletions

diff --git a/sbin/routed/if.c b/sbin/routed/if.c
index 2e505b5..b439767 100644
--- a/sbin/routed/if.c
+++ b/sbin/routed/if.c
@@ -1128,6 +1128,9 @@ ifinit(void)
 					continue;
 				if (ifp1->int_dstaddr == RIP_DEFAULT)
 					continue;
+				/* ignore aliases on the right network */
+				if (!strcmp(ifp->int_name, ifp1->int_name))
+					continue;
 				if (on_net(ifp->int_dstaddr,
 					   ifp1->int_net, ifp1->int_mask)
 				    || on_net(ifp1->int_dstaddr,
diff --git a/sbin/routed/main.c b/sbin/routed/main.c
index 5c52455..70da19d 100644
--- a/sbin/routed/main.c
+++ b/sbin/routed/main.c
@@ -223,7 +223,7 @@ main(int argc,
 		case 'v':
 			/* display version */
 			verbose++;
-			msglog("version 2.21");
+			msglog("version 2.22");
 			break;
 
 		default:
diff --git a/sbin/routed/rdisc.c b/sbin/routed/rdisc.c
index 764463a..56eed8c 100644
--- a/sbin/routed/rdisc.c
+++ b/sbin/routed/rdisc.c
@@ -41,7 +41,7 @@
 #if !defined(sgi) && !defined(__NetBSD__)
 static char sccsid[] __attribute__((unused)) = "@(#)rdisc.c	8.1 (Berkeley) x/y/95";
 #elif defined(__NetBSD__)
-__RCSID"$NetBSD$");
+__RCSID("$NetBSD$");
 #endif
 #ident "$FreeBSD$"
 
diff --git a/sbin/routed/table.c b/sbin/routed/table.c
index 650d01f..acfc76f 100644
--- a/sbin/routed/table.c
+++ b/sbin/routed/table.c
@@ -639,16 +639,18 @@ rtm_type_name(u_char type)
 		"RTM_NEWMADDR",
 		"RTM_DELMADDR"
 	};
-	static char name0[NAME0_LEN];
+#define NEW_RTM_PAT "RTM type %#x"
+	static char name0[sizeof(NEW_RTM_PAT)+2];
 
 
 	if (type > sizeof(rtm_types)/sizeof(rtm_types[0])
 	    || type == 0) {
-		snprintf(name0, NAME0_LEN, "RTM type %#x", type);
+		snprintf(name0, sizeof(name0), NEW_RTM_PAT, type);
 		return name0;
 	} else {
 		return rtm_types[type-1];
 	}
+#undef NEW_RTM_PAT
 }