From 323e6a6ba61d7d3356be1af09ba88bdeab274117 Mon Sep 17 00:00:00 2001 From: Sara Dickinson Date: Fri, 15 Nov 2019 14:29:33 +0000 Subject: [PATCH] Update submodules and fix issue with loading local hosts --- CMakeLists.txt | 2 +- src/yxml | 2 +- stubby | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 458b3a58..b68f5cdf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -158,7 +158,7 @@ if (WIN32) # BUG! Don't hardcode the Windows directory and drive. set(hostsfile "C:/Windows/System32/Drivers/etc/hosts") else () - set(hostsfile "${CMAKE_INSTALL_FULL_SYSCONFDIR}/hosts") + set(hostsfile "/etc/hosts") endif () set(PATH_HOSTS "${hostsfile}" CACHE STRING "Set the static table lookup for hostnames path.") set(PATH_RESOLVCONF "/etc/resolv.conf" CACHE STRING "Set the resolver configuration file path. Not used on Windows, where values are retrieved via GetNetworkParams().") diff --git a/src/yxml b/src/yxml index 10f968b0..0d7b9c16 160000 --- a/src/yxml +++ b/src/yxml @@ -1 +1 @@ -Subproject commit 10f968b0e78b9aeee357d0de81a46b445c3fb27b +Subproject commit 0d7b9c16d83cb1a3083cbc3c3c2eb9e87fc6293c diff --git a/stubby b/stubby index 6ce87658..0f8fd662 160000 --- a/stubby +++ b/stubby @@ -1 +1 @@ -Subproject commit 6ce87658d2504c06a47ec60de27e6ae282635f0a +Subproject commit 0f8fd662e30e87d309f703c97550ea80f63d0dc4