Module Name: src
Committed By: ozaki-r
Date: Mon Jun 15 04:15:33 UTC 2015
Modified Files:
src/usr.sbin/rtadvd: rtadvd.c
Log Message:
Fix regression on sending RA messages
r1.48 dropped hoplimit cmsg but forgot to adjust cmsg buffer length.
Reported by Timo Buhrmester
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/usr.sbin/rtadvd/rtadvd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/rtadvd/rtadvd.c
diff -u src/usr.sbin/rtadvd/rtadvd.c:1.49 src/usr.sbin/rtadvd/rtadvd.c:1.50
--- src/usr.sbin/rtadvd/rtadvd.c:1.49 Fri Jun 5 15:41:59 2015
+++ src/usr.sbin/rtadvd/rtadvd.c Mon Jun 15 04:15:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rtadvd.c,v 1.49 2015/06/05 15:41:59 roy Exp $ */
+/* $NetBSD: rtadvd.c,v 1.50 2015/06/15 04:15:33 ozaki-r Exp $ */
/* $KAME: rtadvd.c,v 1.92 2005/10/17 14:40:02 suz Exp $ */
/*
@@ -1503,8 +1503,7 @@ sock_open(void)
exit(1);
}
- sndcmsgbuflen = CMSG_SPACE(sizeof(struct in6_pktinfo)) +
- CMSG_SPACE(sizeof(int));
+ sndcmsgbuflen = CMSG_SPACE(sizeof(struct in6_pktinfo));
sndcmsgbuf = malloc(sndcmsgbuflen);
if (sndcmsgbuf == NULL) {
syslog(LOG_ERR, "<%s> malloc: %m", __func__);
