Module Name: src Committed By: roy Date: Tue Apr 24 18:31:48 UTC 2018
Modified Files: src/usr.sbin/rtadvd: rtadvd.c Log Message: Back out part of the prior commit where we added space for IPV6_HOPLIMIT to the sending control message buffer. That code never worked on ERLITE, so I elected to set socket options instead but forgot to revert this part. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 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.65 src/usr.sbin/rtadvd/rtadvd.c:1.66 --- src/usr.sbin/rtadvd/rtadvd.c:1.65 Fri Apr 20 15:57:23 2018 +++ src/usr.sbin/rtadvd/rtadvd.c Tue Apr 24 18:31:48 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: rtadvd.c,v 1.65 2018/04/20 15:57:23 roy Exp $ */ +/* $NetBSD: rtadvd.c,v 1.66 2018/04/24 18:31:48 roy Exp $ */ /* $KAME: rtadvd.c,v 1.92 2005/10/17 14:40:02 suz Exp $ */ /* @@ -1514,8 +1514,7 @@ sock_open(void) exit(EXIT_FAILURE); } - sndcmsgbuflen = CMSG_SPACE(sizeof(struct in6_pktinfo)) + - CMSG_SPACE(sizeof(int)); + sndcmsgbuflen = CMSG_SPACE(sizeof(struct in6_pktinfo)); sndcmsgbuf = malloc(sndcmsgbuflen); if (sndcmsgbuf == NULL) { logit(LOG_ERR, "%s: malloc: %m", __func__);