View | Details | Raw Unified | Return to bug 27665
Collapse All | Expand All

(-)NetworkManager-pptp-0.9.6.0.orig/src/nm-pptp-service.c (-1 / +9 lines)
Lines 848-854 construct_pppd_args (NMPptpPlugin *plugi Link Here
848
848
849
	g_ptr_array_add (args, (gpointer) g_strdup ("nodetach"));
849
	g_ptr_array_add (args, (gpointer) g_strdup ("nodetach"));
850
	g_ptr_array_add (args, (gpointer) g_strdup ("lock"));
850
	g_ptr_array_add (args, (gpointer) g_strdup ("lock"));
851
	g_ptr_array_add (args, (gpointer) g_strdup ("usepeerdns"));
851
852
	/* XXX: (GM): this is a hack to ensure that pppd isn't provided
853
		with usepeerdns when NM's configs say to forget acquired
854
		NSes.  With usepeerdns and the current implementation of
855
		this plugin, pppd will execute /etc/ppp/ip-up and will
856
		replace /etc/resolv.conf. */
857
	if (!nm_setting_ip4_config_get_ignore_auto_dns ((NMSettingIP4Config *) nm_connection_get_setting (NM_PPTP_PLUGIN_GET_PRIVATE (plugin)->connection, NM_TYPE_SETTING_IP4_CONFIG)))
858
		g_ptr_array_add (args, (gpointer) g_strdup ("usepeerdns"));
859
852
	g_ptr_array_add (args, (gpointer) g_strdup ("noipdefault"));
860
	g_ptr_array_add (args, (gpointer) g_strdup ("noipdefault"));
853
	g_ptr_array_add (args, (gpointer) g_strdup ("nodefaultroute"));
861
	g_ptr_array_add (args, (gpointer) g_strdup ("nodefaultroute"));
854
862

Return to bug 27665