diff options
| author | Dan Winship <danw@gnome.org> | 2013-09-26 17:34:23 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2013-10-11 12:24:34 -0400 |
| commit | 68f12b4e9c134d41e42cc8a1986cad6bb3c07b7a (patch) | |
| tree | de39f242269a9e2b0bf5edfbb75bb61092639928 /src/NetworkManagerUtils.h | |
| parent | 5bcdfd39853f5953a956fc88cc5a550f68f3153f (diff) | |
| download | NetworkManager-68f12b4e9c134d41e42cc8a1986cad6bb3c07b7a.tar.gz | |
settings: make connections always have s_ip4 and s_ip6
Make sure that all connections returned from NMSettings or created via
AddAndActivateConnection have an NMSettingIP4Config and an
NMSettingIP6Config, with non-NULL methods, and get rid of
now-unnecessary checks for those.
Also move the slaves-can't-have-IP-config checks into the
platform-independent code as well. This also gets rid of spurious
"ignoring IP4/IP6 configuration" warnings in ifcfg-rh when reading a
slave ifcfg file.
Partly based on a patch from Pavel.
https://bugzilla.gnome.org/show_bug.cgi?id=708875
Diffstat (limited to 'src/NetworkManagerUtils.h')
| -rw-r--r-- | src/NetworkManagerUtils.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h index 819cb075c8..c6ab9a032d 100644 --- a/src/NetworkManagerUtils.h +++ b/src/NetworkManagerUtils.h @@ -82,6 +82,9 @@ gboolean nm_utils_get_proc_sys_net_value_with_bounds (const char *path, gint32 valid_min, gint32 valid_max); +void nm_utils_normalize_connection (NMConnection *connection, + gboolean default_enable_ipv6); + void nm_utils_complete_generic (NMConnection *connection, const char *ctype, const GSList *existing, |