mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-22 02:35:25 +00:00
2008-04-18 Dan Williams <dcbw@redhat.com>
* libnm-util/nm-setting-ppp.c libnm-util/nm-setting-ppp.h src/ppp-manager/nm-ppp-manager.c - Remove the 'usepeerdns' option and always request DNS servers from the PPP server; the connection chooses to use/override/ignore the DNS servers returned from the PPP server git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3576 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
a8f9a8d38e
commit
5e3121cee8
|
@ -1,3 +1,12 @@
|
|||
2008-04-18 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* libnm-util/nm-setting-ppp.c
|
||||
libnm-util/nm-setting-ppp.h
|
||||
src/ppp-manager/nm-ppp-manager.c
|
||||
- Remove the 'usepeerdns' option and always request DNS servers from
|
||||
the PPP server; the connection chooses to use/override/ignore the
|
||||
DNS servers returned from the PPP server
|
||||
|
||||
2008-04-18 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* libnm-util/nm-setting-ppp.c
|
||||
|
|
|
@ -16,7 +16,6 @@ enum {
|
|||
PROP_REQUIRE_MPPE_128,
|
||||
PROP_MPPE_STATEFUL,
|
||||
PROP_CRTSCTS,
|
||||
PROP_USEPEERDNS,
|
||||
PROP_BAUD,
|
||||
PROP_MRU,
|
||||
PROP_MTU,
|
||||
|
@ -84,9 +83,6 @@ set_property (GObject *object, guint prop_id,
|
|||
case PROP_CRTSCTS:
|
||||
setting->crtscts = g_value_get_boolean (value);
|
||||
break;
|
||||
case PROP_USEPEERDNS:
|
||||
setting->usepeerdns = g_value_get_boolean (value);
|
||||
break;
|
||||
case PROP_BAUD:
|
||||
setting->baud = g_value_get_uint (value);
|
||||
break;
|
||||
|
@ -145,9 +141,6 @@ get_property (GObject *object, guint prop_id,
|
|||
case PROP_CRTSCTS:
|
||||
g_value_set_boolean (value, setting->crtscts);
|
||||
break;
|
||||
case PROP_USEPEERDNS:
|
||||
g_value_set_boolean (value, setting->usepeerdns);
|
||||
break;
|
||||
case PROP_BAUD:
|
||||
g_value_set_uint (value, setting->baud);
|
||||
break;
|
||||
|
@ -261,14 +254,6 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class)
|
|||
FALSE,
|
||||
G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
|
||||
|
||||
g_object_class_install_property
|
||||
(object_class, PROP_USEPEERDNS,
|
||||
g_param_spec_boolean (NM_SETTING_PPP_USEPEERDNS,
|
||||
"Use peer DNS",
|
||||
"Use peer DNS",
|
||||
FALSE,
|
||||
G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
|
||||
|
||||
g_object_class_install_property
|
||||
(object_class, PROP_BAUD,
|
||||
g_param_spec_uint (NM_SETTING_PPP_BAUD,
|
||||
|
|
|
@ -26,7 +26,6 @@ G_BEGIN_DECLS
|
|||
#define NM_SETTING_PPP_REQUIRE_MPPE_128 "require-mppe-128"
|
||||
#define NM_SETTING_PPP_MPPE_STATEFUL "mpppe-stateful"
|
||||
#define NM_SETTING_PPP_CRTSCTS "crtscts"
|
||||
#define NM_SETTING_PPP_USEPEERDNS "usepeerdns"
|
||||
#define NM_SETTING_PPP_BAUD "baud"
|
||||
#define NM_SETTING_PPP_MRU "mru"
|
||||
#define NM_SETTING_PPP_MTU "mtu"
|
||||
|
@ -46,7 +45,6 @@ typedef struct {
|
|||
gboolean require_mppe_128;
|
||||
gboolean mppe_stateful;
|
||||
gboolean crtscts;
|
||||
gboolean usepeerdns;
|
||||
|
||||
gint32 baud;
|
||||
gint32 mru;
|
||||
|
|
|
@ -543,8 +543,11 @@ create_pppd_cmd_line (NMSettingPPP *setting,
|
|||
nm_cmd_line_add_string (cmd, "mppe-stateful");
|
||||
if (setting->crtscts)
|
||||
nm_cmd_line_add_string (cmd, "crtscts");
|
||||
if (setting->usepeerdns)
|
||||
nm_cmd_line_add_string (cmd, "usepeerdns");
|
||||
|
||||
/* Always ask for DNS, we don't have to use them if the connection
|
||||
* overrides the returned servers.
|
||||
*/
|
||||
nm_cmd_line_add_string (cmd, "usepeerdns");
|
||||
|
||||
if (setting->mru) {
|
||||
nm_cmd_line_add_string (cmd, "mru");
|
||||
|
@ -596,7 +599,6 @@ pppoe_fill_defaults (NMSettingPPP *setting)
|
|||
setting->lcp_echo_failure = 3;
|
||||
|
||||
setting->noauth = TRUE;
|
||||
setting->usepeerdns = TRUE;
|
||||
setting->nodeflate = TRUE;
|
||||
|
||||
/* FIXME: These commented settings should be set as well, update NMSettingPPP first. */
|
||||
|
|
Loading…
Reference in a new issue