Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/rtadvd Back out part of the prior comm...



details:   https://anonhg.NetBSD.org/src/rev/fc0ba25a7eb9
branches:  trunk
changeset: 318454:fc0ba25a7eb9
user:      roy <roy%NetBSD.org@localhost>
date:      Tue Apr 24 18:31:48 2018 +0000
description:
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.

diffstat:

 usr.sbin/rtadvd/rtadvd.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (19 lines):

diff -r c3450a56445e -r fc0ba25a7eb9 usr.sbin/rtadvd/rtadvd.c
--- a/usr.sbin/rtadvd/rtadvd.c  Tue Apr 24 18:10:32 2018 +0000
+++ b/usr.sbin/rtadvd/rtadvd.c  Tue Apr 24 18:31:48 2018 +0000
@@ -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 @@
                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__);



Home | Main Index | Thread Index | Old Index