From 255cc9ab36f791c25ad04166d3268e83934de623 Mon Sep 17 00:00:00 2001 From: Willem Toorop Date: Thu, 14 Jul 2016 15:42:49 +0200 Subject: [PATCH] First bit of set_from_os loads OS defaults --- src/context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/context.c b/src/context.c index edea6aef..a93e6f14 100644 --- a/src/context.c +++ b/src/context.c @@ -1277,10 +1277,10 @@ getdns_context_create_with_extended_memory_functions( // resolv.conf does not exist on Windows, handle differently #ifndef USE_WINSOCK - if (set_from_os && (r = set_os_defaults(result))) + if ((set_from_os & 1) && (r = set_os_defaults(result))) goto error; #else - if (set_from_os && (r = set_os_defaults_windows(result))) + if ((set_from_os & 1) && (r = set_os_defaults_windows(result))) goto error; #endif