diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2022-06-24 00:30:04 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2022-06-24 00:30:04 +0200 |
| commit | cf62f0e3a15c71cb036f272c6b1d3793e6acd5c1 (patch) | |
| tree | 9f555e4717f925a27304dca4f49bee6c38e8631b | |
| parent | 6fee8aa454d18fb9147fe229fe0cf6120ed41020 (diff) | |
| download | NetworkManager-cf62f0e3a15c71cb036f272c6b1d3793e6acd5c1.tar.gz | |
nmcli/connections: make enable_options() always enable an option
| -rw-r--r-- | src/nmcli/connections.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/nmcli/connections.c b/src/nmcli/connections.c index 73d34452ad..4d646798de 100644 --- a/src/nmcli/connections.c +++ b/src/nmcli/connections.c @@ -4179,11 +4179,9 @@ enable_options(const char *setting_name, const char *property, const char *const continue; } - if (bi->base.inf_flags & NM_META_PROPERTY_INF_FLAG_DONT_ASK) { - _dynamic_options_set((const NMMetaAbstractInfo *) bi, - PROPERTY_INF_FLAG_ENABLED, - PROPERTY_INF_FLAG_ENABLED); - } + _dynamic_options_set((const NMMetaAbstractInfo *) bi, + PROPERTY_INF_FLAG_ENABLED | PROPERTY_INF_FLAG_DISABLED, + PROPERTY_INF_FLAG_ENABLED); } return; } @@ -4196,11 +4194,9 @@ enable_options(const char *setting_name, const char *property, const char *const return; } - if (property_info->inf_flags & NM_META_PROPERTY_INF_FLAG_DONT_ASK) { - _dynamic_options_set((const NMMetaAbstractInfo *) property_info, - PROPERTY_INF_FLAG_ENABLED, - PROPERTY_INF_FLAG_ENABLED); - } + _dynamic_options_set((const NMMetaAbstractInfo *) property_info, + PROPERTY_INF_FLAG_ENABLED | PROPERTY_INF_FLAG_DISABLED, + PROPERTY_INF_FLAG_ENABLED); } /* |