NetworkManager r4332 - in trunk/vpn-daemons/pptp: . src

[dcbw svn gnome org]

Author: dcbw
Date: Mon Nov 24 05:04:06 2008
New Revision: 4332
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=4332&view=rev

Log:
2008-11-24  Dan Williams  <dcbw redhat com>

	* src/nm-pptp-service.c
		- (construct_pppd_args): send username to server (bgo #561941)



Modified:
   trunk/vpn-daemons/pptp/ChangeLog
   trunk/vpn-daemons/pptp/src/nm-pptp-service.c

Modified: trunk/vpn-daemons/pptp/src/nm-pptp-service.c
==============================================================================
--- trunk/vpn-daemons/pptp/src/nm-pptp-service.c	(original)
+++ trunk/vpn-daemons/pptp/src/nm-pptp-service.c	Mon Nov 24 05:04:06 2008
@@ -678,6 +678,8 @@
                      const char *pppd,
                      GError **error)
 {
+	NMPptpPluginPrivate *priv = NM_PPTP_PLUGIN_GET_PRIVATE (plugin);
+	NMPptpPppServicePrivate *service_priv = NULL;
 	GPtrArray *args = NULL;
 	const char *value, *pptp_binary;
 	char *ipparam, *tmp;
@@ -725,6 +727,13 @@
 	g_ptr_array_add (args, (gpointer) g_strdup ("noipdefault"));
 	g_ptr_array_add (args, (gpointer) g_strdup ("nodefaultroute"));
 
+	if (priv->service)
+		service_priv = NM_PPTP_PPP_SERVICE_GET_PRIVATE (priv->service);
+	if (service_priv && strlen (service_priv->username)) {
+		g_ptr_array_add (args, (gpointer) g_strdup ("user"));
+		g_ptr_array_add (args, (gpointer) g_strdup (service_priv->username));
+	}
+
 	value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_REFUSE_EAP);
 	if (value && !strcmp (value, "yes"))
 		g_ptr_array_add (args, (gpointer) g_strdup ("refuse-eap"));