36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From 164cc81569283e3c27478e39a3a8ec65e2ff34ca Mon Sep 17 00:00:00 2001
|
|
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
Date: Mon, 12 Sep 2022 13:47:35 +0200
|
|
Subject: [PATCH 2/3] config-data: style fix
|
|
|
|
(cherry picked from commit 051819a78e6d2c4b4a5a158f78a50e1ff524fe9c)
|
|
---
|
|
src/core/nm-config-data.c | 11 +++++++----
|
|
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/core/nm-config-data.c b/src/core/nm-config-data.c
|
|
index 61cf111894..1504b15659 100644
|
|
--- a/src/core/nm-config-data.c
|
|
+++ b/src/core/nm-config-data.c
|
|
@@ -1125,10 +1125,13 @@ load_global_dns(GKeyFile *keyfile, gboolean internal)
|
|
gboolean default_found = FALSE;
|
|
char **strv;
|
|
|
|
- group =
|
|
- internal ? NM_CONFIG_KEYFILE_GROUP_INTERN_GLOBAL_DNS : NM_CONFIG_KEYFILE_GROUP_GLOBAL_DNS;
|
|
- domain_prefix = internal ? NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN_GLOBAL_DNS_DOMAIN
|
|
- : NM_CONFIG_KEYFILE_GROUPPREFIX_GLOBAL_DNS_DOMAIN;
|
|
+ if (internal) {
|
|
+ group = NM_CONFIG_KEYFILE_GROUP_INTERN_GLOBAL_DNS;
|
|
+ domain_prefix = NM_CONFIG_KEYFILE_GROUPPREFIX_INTERN_GLOBAL_DNS_DOMAIN;
|
|
+ } else {
|
|
+ group = NM_CONFIG_KEYFILE_GROUP_GLOBAL_DNS;
|
|
+ domain_prefix = NM_CONFIG_KEYFILE_GROUPPREFIX_GLOBAL_DNS_DOMAIN;
|
|
+ }
|
|
domain_prefix_len = strlen(domain_prefix);
|
|
|
|
if (!nm_config_keyfile_has_global_dns_config(keyfile, internal))
|
|
--
|
|
2.39.1
|
|
|