head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.10
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.8
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.6
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.4
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.2
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.1.0.2
	pkgsrc-2008Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2009.02.19.11.17.19;	author roy;	state dead;
branches;
next	1.1;

1.1
date	2008.12.19.07.53.43;	author roy;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to dnsmasq-2.47

Fixes from 2.46 include:
 * NetBSD-5 support
 * Better duplicate IPv6 address detection
 * DBus introspection
 * work with blank lines in /etc/ethers
@
text
@$NetBSD: patch-ae,v 1.1 2008/12/19 07:53:43 roy Exp $

--- src/bpf.c	2008-11-03 16:26:06.000000000 +0000
+++ src/bpf.c	2008-11-18 20:51:27.000000000 +0000
@@@@ -68,11 +68,15 @@@@
       /* subsequent entries may not be aligned, so copy into
 	 an aligned buffer to avoid nasty complaints about 
 	 unaligned accesses. */
-#ifdef HAVE_SOCKADDR_SA_LEN
-      len = ((struct ifreq *)ptr)->ifr_addr.sa_len + offsetof(struct ifreq, ifr_ifru);
-#else
+
       len = sizeof(struct ifreq);
+      
+#ifdef HAVE_SOCKADDR_SA_LEN
+      ifr = (struct ifreq *)ptr;
+      if (ifr->ifr_addr.sa_len > sizeof(ifr->ifr_ifru))
+	len = ifr->ifr_addr.sa_len + offsetof(struct ifreq, ifr_ifru);
 #endif
+      
       if (!expand_buf(&ifreq, len))
 	goto err;
 
@


1.1
log
@Update to dnsmasq-2.46
Noteable changes include:
   NetBSD-5 support
   Optional DBus and IPv6 support
   ISC leasefile support removed
   Support DHCP clients in multiple DNS domains
   Re-read /etc/resolv.conf when an "interface up" event occurs
@
text
@d1 1
a1 1
$NetBSD$
@