diff options
| author | Dan Williams <dcbw@redhat.com> | 2008-08-01 14:27:47 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2008-08-01 14:27:47 +0000 |
| commit | 0d85411ed48707d91dbe97670359d379c8c9760c (patch) | |
| tree | fc6449b75c1d67022e784c2fbc3661236a148641 /libnm-util/nm-setting-ip4-config.c | |
| parent | ad5ae13d63b07583f82798b86cc675ca621bab92 (diff) | |
| download | NetworkManager-0d85411ed48707d91dbe97670359d379c8c9760c.tar.gz | |
2008-08-01 Dan Williams <dcbw@redhat.com>
* libnm-util/nm-setting-ip4-config.c
libnm-util/nm-setting-ip4-config.h
- Make IPv4 methods reflect their usage; 'dhcp' -> 'auto' and
'autoip' -> 'link-local'. VPN & PPP connections can also have IPv4
settings, and they don't necessarily use DHCP.
* src/NetworkManagerPolicy.c
src/nm-device.c
system-settings/plugins/ifcfg-fedora/reader.c
system-settings/plugins/ifcfg-suse/parser.c
- Fixup for method changes
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3882 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'libnm-util/nm-setting-ip4-config.c')
| -rw-r--r-- | libnm-util/nm-setting-ip4-config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c index d452c46ecc..1def822e1c 100644 --- a/libnm-util/nm-setting-ip4-config.c +++ b/libnm-util/nm-setting-ip4-config.c @@ -112,7 +112,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_IP4_CONFIG_ADDRESSES); return FALSE; } - } else if ( !strcmp (self->method, NM_SETTING_IP4_CONFIG_METHOD_AUTOIP) + } else if ( !strcmp (self->method, NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL) || !strcmp (self->method, NM_SETTING_IP4_CONFIG_METHOD_SHARED)) { if (self->dns && self->dns->len) { g_set_error (error, @@ -137,7 +137,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) NM_SETTING_IP4_CONFIG_ADDRESSES); return FALSE; } - } else if (!strcmp (self->method, NM_SETTING_IP4_CONFIG_METHOD_DHCP)) { + } else if (!strcmp (self->method, NM_SETTING_IP4_CONFIG_METHOD_AUTO)) { /* nothing to do */ } else { g_set_error (error, |