Skip to content
Find file Blame History Permalink
  • Thomas Haller's avatar
    core: add @merge_flags argument to nm_ip4_config_merge() and nm_ip6_config_merge() · f7a8962d
    Thomas Haller authored 
    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.
    f7a8962d