diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-08-05 10:01:39 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-08-06 17:52:55 +0200 |
| commit | f7a8962dd47099425438ee484e02f40e18b6ee79 (patch) | |
| tree | 21f0e518e3a42ccad93fb97eab60b53b3f0ebefc /src/nm-ip4-config.h | |
| parent | 54d10f0ec1af3a2ba2a95608703bebba4d04b638 (diff) | |
| download | NetworkManager-f7a8962dd47099425438ee484e02f40e18b6ee79.tar.gz | |
core: add @merge_flags argument to nm_ip4_config_merge() and nm_ip6_config_merge()
The new flags are not yet used, so there is no change in functionality.
The flags NM_IP_CONFIG_MERGE_NO_ROUTES and NM_IP_CONFIG_MERGE_NO_DNS go
together with the 'ignore-auto-routes' and 'ignore-auto-dns' setting.
Note that for IPv4, NM_IP_CONFIG_MERGE_NO_DNS also ignores NIS, WINS, and dns-options.
This is different from current other places that handle 'ignore-auto-dns'
and only care about nameservers, domains, and searches.
Diffstat (limited to 'src/nm-ip4-config.h')
| -rw-r--r-- | src/nm-ip4-config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h index bffebe2cd8..1c76b97e99 100644 --- a/src/nm-ip4-config.h +++ b/src/nm-ip4-config.h @@ -70,7 +70,7 @@ void nm_ip4_config_merge_setting (NMIP4Config *config, NMSettingIPConfig *settin NMSetting *nm_ip4_config_create_setting (const NMIP4Config *config); /* Utility functions */ -void nm_ip4_config_merge (NMIP4Config *dst, const NMIP4Config *src); +void nm_ip4_config_merge (NMIP4Config *dst, const NMIP4Config *src, NMIPConfigMergeFlags merge_flags); void nm_ip4_config_subtract (NMIP4Config *dst, const NMIP4Config *src); void nm_ip4_config_intersect (NMIP4Config *dst, const NMIP4Config *src); gboolean nm_ip4_config_replace (NMIP4Config *dst, const NMIP4Config *src, gboolean *relevant_changes); |