NetworkManager r4209 - in trunk: . src/ppp-manager

[dcbw svn gnome org]

Author: dcbw
Date: Thu Oct 23 18:04:47 2008
New Revision: 4209
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=4209&view=rev

Log:
2008-10-23  Dan Williams  <dcbw redhat com>

	* src/ppp-manager/nm-ppp-manager.c
		- (create_pppd_cmd_line): 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)



Modified:
   trunk/ChangeLog
   trunk/src/ppp-manager/nm-ppp-manager.c

Modified: trunk/src/ppp-manager/nm-ppp-manager.c
==============================================================================
--- trunk/src/ppp-manager/nm-ppp-manager.c	(original)
+++ trunk/src/ppp-manager/nm-ppp-manager.c	Thu Oct 23 18:04:47 2008
@@ -725,6 +725,9 @@
 	nm_cmd_line_add_string (cmd, "nodetach");
 	nm_cmd_line_add_string (cmd, "lock");
 
+	/* NM handles setting the default route */
+	nm_cmd_line_add_string (cmd, "nodefaultroute");
+
 	ppp_debug = getenv ("NM_PPP_DEBUG");
 	if (ppp_debug)
 		nm_cmd_line_add_string (cmd, "debug");
@@ -797,15 +800,11 @@
 		nm_cmd_line_add_int (cmd, setting->mtu);
 	}
 
-	if (setting->lcp_echo_failure) {
-		nm_cmd_line_add_string (cmd, "lcp-echo-failure");
-		nm_cmd_line_add_int (cmd, setting->lcp_echo_failure);
-	}
+	nm_cmd_line_add_string (cmd, "lcp-echo-failure");
+	nm_cmd_line_add_int (cmd, setting->lcp_echo_failure);
 
-	if (setting->lcp_echo_interval) {
-		nm_cmd_line_add_string (cmd, "lcp-echo-interval");
-		nm_cmd_line_add_int (cmd, setting->lcp_echo_interval);
-	}
+	nm_cmd_line_add_string (cmd, "lcp-echo-interval");
+	nm_cmd_line_add_int (cmd, setting->lcp_echo_interval);
 
 	nm_cmd_line_add_string (cmd, "ipparam");
 	nm_cmd_line_add_string (cmd, priv->dbus_path);