From 595f76e2434b94171bd428cdb43eb7b7ee92f8ff Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 20 Apr 2020 09:39:41 +0200 Subject: [PATCH] libnm-core: add 'no-reload' and 'trust-ad' resolv.conf options https://sourceware.org/git/?p=glibc.git;a=blob;f=resolv/res_init.c;h=95dce098aa7ec80f2e36f5c25022641d65e1d5e5;hb=9ea3686266dca3f004ba874745a4087a89682617#l681 https://bugzilla.redhat.com/show_bug.cgi?id=1825285 (cherry picked from commit 40b2cf7a0c652814638207b2951c6f7c80aa8033) (cherry picked from commit 5b83609b0190f50d4fd6f5af71e30b0db3be6a8c) --- libnm-core/nm-setting-ip-config.c | 2 ++ libnm-core/nm-setting-ip-config.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c index 7f1690ac6a..adb71a80af 100644 --- a/libnm-core/nm-setting-ip-config.c +++ b/libnm-core/nm-setting-ip-config.c @@ -47,6 +47,8 @@ const NMUtilsDNSOptionDesc _nm_utils_dns_option_descs[] = { { NM_SETTING_DNS_OPTION_SINGLE_REQUEST_REOPEN, FALSE, FALSE }, { NM_SETTING_DNS_OPTION_NO_TLD_QUERY, FALSE, FALSE }, { NM_SETTING_DNS_OPTION_USE_VC, FALSE, FALSE }, + { NM_SETTING_DNS_OPTION_NO_RELOAD, FALSE, FALSE }, + { NM_SETTING_DNS_OPTION_TRUST_AD, FALSE, FALSE }, { NULL, FALSE, FALSE } }; diff --git a/libnm-core/nm-setting-ip-config.h b/libnm-core/nm-setting-ip-config.h index ef3671c40b..ae77480c08 100644 --- a/libnm-core/nm-setting-ip-config.h +++ b/libnm-core/nm-setting-ip-config.h @@ -368,6 +368,8 @@ char *nm_ip_routing_rule_to_string (const NMIPRoutingRule *self, #define NM_SETTING_DNS_OPTION_SINGLE_REQUEST_REOPEN "single-request-reopen" #define NM_SETTING_DNS_OPTION_NO_TLD_QUERY "no-tld-query" #define NM_SETTING_DNS_OPTION_USE_VC "use-vc" +#define NM_SETTING_DNS_OPTION_NO_RELOAD "no-reload" +#define NM_SETTING_DNS_OPTION_TRUST_AD "trust-ad" /** * NMSettingIPConfig: