colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-10-24 Dan Williams <dcbw@redhat.com>

Browse Source 
* src/nm-pptp-service.c
		- (construct_pppd_args): pppd always parses /etc/ppp/options, so always
			add really important stuff to the command line to ensure that NM
			overrides /etc/ppp/options (bgo #556781)



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4210 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-10-24 15:03:29 +00:00
parent b7b5110d16
commit 15d8c9d075
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vpn-daemons/pptp/ChangeLog
View File

@@ -1,3 +1,10 @@
2008-10-24 Dan Williams <dcbw@redhat.com>
* src/nm-pptp-service.c
- (construct_pppd_args): pppd always parses /etc/ppp/options, so always
add really important stuff to the command line to ensure that NM
overrides /etc/ppp/options (bgo #556781)
2008-10-14 Dan Williams <dcbw@redhat.com> 2008-10-14 Dan Williams <dcbw@redhat.com>
* src/nm-pptp-pppd-plugin.c * src/nm-pptp-pppd-plugin.c

12
vpn-daemons/pptp/src/nm-pptp-service.c
View File

@@ -650,6 +650,7 @@ construct_pppd_args (NMPptpPlugin *plugin,
GPtrArray *args = NULL; GPtrArray *args = NULL;
const char *value, *pptp_binary; const char *value, *pptp_binary;
char *ipparam, *tmp; char *ipparam, *tmp;
gboolean set = FALSE;
pptp_binary = nm_find_pptp (); pptp_binary = nm_find_pptp ();
if (!pptp_binary) { if (!pptp_binary) {
@@ -689,6 +690,7 @@ construct_pppd_args (NMPptpPlugin *plugin,
g_ptr_array_add (args, (gpointer) g_strdup ("lock")); g_ptr_array_add (args, (gpointer) g_strdup ("lock"));
g_ptr_array_add (args, (gpointer) g_strdup ("usepeerdns")); g_ptr_array_add (args, (gpointer) g_strdup ("usepeerdns"));
g_ptr_array_add (args, (gpointer) g_strdup ("noipdefault")); g_ptr_array_add (args, (gpointer) g_strdup ("noipdefault"));
g_ptr_array_add (args, (gpointer) g_strdup ("nodefaultroute"));
value = g_hash_table_lookup (s_vpn->data, NM_PPTP_KEY_REFUSE_EAP); value = g_hash_table_lookup (s_vpn->data, NM_PPTP_KEY_REFUSE_EAP);
if (value && !strcmp (value, "yes")) if (value && !strcmp (value, "yes"))
@@ -750,7 +752,12 @@ construct_pppd_args (NMPptpPlugin *plugin,
if (errno == 0) { if (errno == 0) {
g_ptr_array_add (args, (gpointer) g_strdup ("lcp-echo-failure")); g_ptr_array_add (args, (gpointer) g_strdup ("lcp-echo-failure"));
g_ptr_array_add (args, (gpointer) g_strdup_printf ("%ld", tmp_int)); g_ptr_array_add (args, (gpointer) g_strdup_printf ("%ld", tmp_int));
} else {
nm_warning ("failed to convert lcp-echo-failure value '%s'", value);
} }
} else {
g_ptr_array_add (args, (gpointer) g_strdup ("lcp-echo-failure"));
g_ptr_array_add (args, (gpointer) g_strdup ("0"));
} }
value = g_hash_table_lookup (s_vpn->data, NM_PPTP_KEY_LCP_ECHO_INTERVAL); value = g_hash_table_lookup (s_vpn->data, NM_PPTP_KEY_LCP_ECHO_INTERVAL);
@@ -765,7 +772,12 @@ construct_pppd_args (NMPptpPlugin *plugin,
if (errno == 0) { if (errno == 0) {
g_ptr_array_add (args, (gpointer) g_strdup ("lcp-echo-interval")); g_ptr_array_add (args, (gpointer) g_strdup ("lcp-echo-interval"));
g_ptr_array_add (args, (gpointer) g_strdup_printf ("%ld", tmp_int)); g_ptr_array_add (args, (gpointer) g_strdup_printf ("%ld", tmp_int));
} else {
nm_warning ("failed to convert lcp-echo-interval value '%s'", value);
} }
} else {
g_ptr_array_add (args, (gpointer) g_strdup ("lcp-echo-interval"));
g_ptr_array_add (args, (gpointer) g_strdup ("0"));
} }
g_ptr_array_add (args, (gpointer) g_strdup ("plugin")); g_ptr_array_add (args, (gpointer) g_strdup ("plugin"));