From afb856f53fbbce9df849fb9b1f6e31eb1bf19f1a Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 24 Nov 2008 05:04:06 +0000 Subject: [PATCH] 2008-11-24 Dan Williams * src/nm-pptp-service.c - (construct_pppd_args): send username to server (bgo #561941) git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4332 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- vpn-daemons/pptp/ChangeLog | 5 +++++ vpn-daemons/pptp/src/nm-pptp-service.c | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/vpn-daemons/pptp/ChangeLog b/vpn-daemons/pptp/ChangeLog index d6d1ad622..497d79422 100644 --- a/vpn-daemons/pptp/ChangeLog +++ b/vpn-daemons/pptp/ChangeLog @@ -1,3 +1,8 @@ +2008-11-24 Dan Williams + + * src/nm-pptp-service.c + - (construct_pppd_args): send username to server (bgo #561941) + 2008-11-04 Dan Williams Fix bgo #559152 diff --git a/vpn-daemons/pptp/src/nm-pptp-service.c b/vpn-daemons/pptp/src/nm-pptp-service.c index 42f76c215..3a3124e30 100644 --- a/vpn-daemons/pptp/src/nm-pptp-service.c +++ b/vpn-daemons/pptp/src/nm-pptp-service.c @@ -678,6 +678,8 @@ construct_pppd_args (NMPptpPlugin *plugin, 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 @@ construct_pppd_args (NMPptpPlugin *plugin, 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"));