mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-22 02:35:25 +00:00
2008-05-29 Dan Williams <dcbw@redhat.com>
* libnm-util/nm-setting-ip4-config.c libnm-util/nm-setting-ip4-config.h - Add a 'shared' method to indicate that this connection should be brought up with a DHCP and proxy DNS server to facilitate connection sharing. - (verify): 'shared' method doesn't allow DNS or searches either git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3709 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
f20d3695ff
commit
cab22d895c
|
@ -1,3 +1,12 @@
|
|||
2008-05-29 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* libnm-util/nm-setting-ip4-config.c
|
||||
libnm-util/nm-setting-ip4-config.h
|
||||
- Add a 'shared' method to indicate that this connection should be
|
||||
brought up with a DHCP and proxy DNS server to facilitate
|
||||
connection sharing.
|
||||
- (verify): 'shared' method doesn't allow DNS or searches either
|
||||
|
||||
2008-05-29 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* configure.in
|
||||
|
|
|
@ -40,19 +40,20 @@ verify (NMSetting *setting, GSList *all_settings)
|
|||
g_warning ("address is not provided");
|
||||
return FALSE;
|
||||
}
|
||||
} else if (!strcmp (self->method, NM_SETTING_IP4_CONFIG_METHOD_AUTOIP)) {
|
||||
} else if ( !strcmp (self->method, NM_SETTING_IP4_CONFIG_METHOD_AUTOIP)
|
||||
|| !strcmp (self->method, NM_SETTING_IP4_CONFIG_METHOD_SHARED)) {
|
||||
if (self->dns && self->dns->len) {
|
||||
g_warning ("may not specify DNS when using autoip");
|
||||
g_warning ("may not specify DNS when using autoip/shared");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (g_slist_length (self->dns_search)) {
|
||||
g_warning ("may not specify DNS searches when using autoip");
|
||||
g_warning ("may not specify DNS searches when using autoip/shared");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (g_slist_length (self->addresses)) {
|
||||
g_warning ("may not specify IP addresses when using autoip");
|
||||
g_warning ("may not specify IP addresses when using autoip/shared");
|
||||
return FALSE;
|
||||
}
|
||||
} else if (!strcmp (self->method, NM_SETTING_IP4_CONFIG_METHOD_DHCP)) {
|
||||
|
|
|
@ -25,6 +25,7 @@ G_BEGIN_DECLS
|
|||
#define NM_SETTING_IP4_CONFIG_METHOD_DHCP "dhcp"
|
||||
#define NM_SETTING_IP4_CONFIG_METHOD_AUTOIP "autoip"
|
||||
#define NM_SETTING_IP4_CONFIG_METHOD_MANUAL "manual"
|
||||
#define NM_SETTING_IP4_CONFIG_METHOD_SHARED "shared"
|
||||
|
||||
typedef struct {
|
||||
guint32 address;
|
||||
|
|
Loading…
Reference in a new issue