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

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

Browse Source 
* 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
This commit is contained in:
Dan Williams
2008-11-24 05:04:06 +00:00
parent ccbd9155ec
commit afb856f53f
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vpn-daemons/pptp/ChangeLog
View File

@@ -1,3 +1,8 @@
2008-11-24 Dan Williams <dcbw@redhat.com>
* src/nm-pptp-service.c
- (construct_pppd_args): send username to server (bgo #561941)
2008-11-04 Dan Williams <dcbw@redhat.com> 2008-11-04 Dan Williams <dcbw@redhat.com>
Fix bgo #559152 Fix bgo #559152

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

@@ -678,6 +678,8 @@ construct_pppd_args (NMPptpPlugin *plugin,
const char *pppd, const char *pppd,
GError **error) GError **error)
{ {
NMPptpPluginPrivate *priv = NM_PPTP_PLUGIN_GET_PRIVATE (plugin);
NMPptpPppServicePrivate *service_priv = NULL;
GPtrArray *args = NULL; GPtrArray *args = NULL;
const char *value, *pptp_binary; const char *value, *pptp_binary;
char *ipparam, *tmp; 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 ("noipdefault"));
g_ptr_array_add (args, (gpointer) g_strdup ("nodefaultroute")); 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); value = nm_setting_vpn_get_data_item (s_vpn, NM_PPTP_KEY_REFUSE_EAP);
if (value && !strcmp (value, "yes")) if (value && !strcmp (value, "yes"))
g_ptr_array_add (args, (gpointer) g_strdup ("refuse-eap")); g_ptr_array_add (args, (gpointer) g_strdup ("refuse-eap"));