Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-20 02:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug when >1 IPv6 address supplied to Dbus SetServers method.

Browse Source
This commit is contained in:
Simon Kelley
2014-06-08 21:51:29 +01:00
parent 6799a46605
commit 006c162382
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/dbus.c
View File

@@ -156,13 +156,16 @@ static void dbus_read_servers(DBusMessage *message)
dbus_message_iter_get_basic(&iter, &p[i]); dbus_message_iter_get_basic(&iter, &p[i]);
dbus_message_iter_next (&iter); dbus_message_iter_next (&iter);
if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_BYTE) if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_BYTE)
{
i++;
break; break;
} }
}
#ifndef HAVE_IPV6 #ifndef HAVE_IPV6
my_syslog(LOG_WARNING, _("attempt to set an IPv6 server address via DBus - no IPv6 support")); my_syslog(LOG_WARNING, _("attempt to set an IPv6 server address via DBus - no IPv6 support"));
#else #else
if (i == sizeof(struct in6_addr)-1) if (i == sizeof(struct in6_addr))
{ {
memcpy(&addr.in6.sin6_addr, p, sizeof(struct in6_addr)); memcpy(&addr.in6.sin6_addr, p, sizeof(struct in6_addr));
#ifdef HAVE_SOCKADDR_SA_LEN #ifdef HAVE_SOCKADDR_SA_LEN