diff options
| author | Michael Biebl <biebl@debian.org> | 2019-03-31 10:11:55 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-03-31 10:11:55 +0200 |
| commit | 4b96345400eafd4bfc70fd77ef19e026d690aca0 (patch) | |
| tree | fed6aa242532689235f5333132ff98b82961765f /src/nm-config-data.c | |
| parent | 8ea1145a9e031c8021590abf780dd7c149e231cf (diff) | |
| parent | f66fcea265a5869667d832386e9337237a44afef (diff) | |
Merge branch 'master' into stretch-backports
Diffstat (limited to 'src/nm-config-data.c')
| -rw-r--r-- | src/nm-config-data.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/nm-config-data.c b/src/nm-config-data.c index 8d84e74a..0259f001 100644 --- a/src/nm-config-data.c +++ b/src/nm-config-data.c @@ -1241,9 +1241,13 @@ _match_section_infos_lookup (const MatchSectionInfo *match_section_infos, const char *match_device_type, char **out_value) { + const char *match_dhcp_plugin; + if (!match_section_infos) return NULL; + match_dhcp_plugin = nm_dhcp_manager_get_config (nm_dhcp_manager_get ()); + for (; match_section_infos->group_name; match_section_infos++) { char *value = NULL; gboolean match; @@ -1263,7 +1267,7 @@ _match_section_infos_lookup (const MatchSectionInfo *match_section_infos, if (device) match = nm_device_spec_match_list (device, match_section_infos->match_device.spec); else if (pllink) - match = nm_match_spec_device_by_pllink (pllink, match_device_type, match_section_infos->match_device.spec, FALSE); + match = nm_match_spec_device_by_pllink (pllink, match_device_type, match_dhcp_plugin, match_section_infos->match_device.spec, FALSE); else match = FALSE; } else |