pptp vpn still broken

[Nikolaus Filus <nfilus gmx net>]

Hi,

although I should now learn for my final exams, I need some relax and
looked again at the pptp plugin I use for connecting my university VPN.

additionaly to setting my password in the pptp plugin (I really would
wish a GUI solution), I need to apply the following patch, which enables
mschap-v2, makes the checkboxes for mppe and mppc work and fixes a
related crash. Using an older cvs snapshot from 4th february goes up to
a successfull connection by pptp itself, but nm thinks the connection is
not started, doesn't show a vpn icon and the ppp0 device wasn't configured.

Now I updated the cvs snapshot and it comes upto a successfull
connection, ppp0 is configured, but nm crashes after this. Here is a log
output

NetworkManager: <information>   Will activate VPN connection 'cs-Netz',
service 'org.freedesktop.NetworkManager.pptp', user_name 'niko',
vpn_data 'remote / prima.cs.tu-berlin.de / username / XXXXXX / comp-mppc
/ no / encrypt-mppe / yes', route ''.
NetworkManager: <information>   VPN Activation (cs-Netz) Stage 1 of 4
(Connection Prepare) scheduled...
NetworkManager: <information>   VPN Activation (cs-Netz) Stage 1 of 4
(Connection Prepare) ran VPN service daemon
org.freedesktop.NetworkManager.pptp (PID 22711)
NetworkManager: <information>   VPN Activation (cs-Netz) Stage 1 of 4
(Connection Prepare) complete.
NetworkManager: <information>   VPN Activation (cs-Netz) Stage 2 of 4
(Connection Prepare Wait) scheduled...
** Message: <information>       PPTP State change: 1 -> 6

NetworkManager: <information>   VPN service
'org.freedesktop.NetworkManager.pptp' signaled state change 1 -> 6.
NetworkManager: <information>   VPN Activation (cs-Netz) Stage 2 of 4
(Connection Prepare Wait) waiting...
NetworkManager: <information>   VPN Activation (cs-Netz) Stage 2 of 4
(Connection Prepare Wait) complete.
NetworkManager: <information>   VPN Activation (cs-Netz) Stage 3 of 4
(Connect) scheduled...
NetworkManager: <information>   VPN Activation (cs-Netz) Stage 3 of 4
(Connect) sending connect request.
NetworkManager: <information>   VPN Activation (cs-Netz) Stage 3 of 4
(Connect) request sent, waiting for reply...
** Message: <information>       nm_pptp_dbus_message_handler() got
method 'startConnection' for path '/org/freedesktop/NetworkManager/pptp'.

** Message: <information>       PPTP State change: 6 -> 3

NetworkManager: <information>   VPN service
'org.freedesktop.NetworkManager.pptp' signaled state change 6 -> 3.
** Message: <information>       pptp started with pid 22712

Plugin nm-pptp-service-pppd-plugin.so loaded.
nm-pptp: plugin initialized.
Using interface ppp0
Connect: ppp0 <--> /dev/pts/4
NetworkManager: <information>   VPN Activation (cs-Netz) Stage 3 of 4
(Connect) reply received.
NetworkManager: <information>   VPN Activation (cs-Netz) Stage 4 of 4
(IP Config Get) timeout scheduled...
NetworkManager: <information>   VPN Activation (cs-Netz) Stage 3 of 4
(Connect) complete, waiting for IP configuration...
MPPE 128-bit stateless compression enabled
local  IP address 130.149.XXXX
remote IP address 130.149.145.8
primary   DNS address 130.149.17.4
secondary DNS address 130.149.19.1
** Message: <information>       nm_pptp_dbus_message_handler() got
method 'signalIP4Config' for path '/org/freedesktop/NetworkManager/pptp'.

** Message: <information>       PPTP State change: 3 -> 4

NetworkManager: <information>   VPN Activation (cs-Netz) Stage 4 of 4
(IP Config Get) reply received.
NetworkManager: <WARNING>        nm_signal_handler (): Caught signal 11.
 Generating backtrace...
NetworkManager: ******************* START **********************************
NetworkManager: Frame 0: /opt/NetworkManager/sbin/NetworkManager [0x806c3f3]
NetworkManager: Frame 1: /opt/NetworkManager/sbin/NetworkManager [0x806c54b]
NetworkManager: Frame 2: /opt/NetworkManager/sbin/NetworkManager [0x806c61c]
NetworkManager: Frame 3: /lib/libpthread.so.0 [0xb7f14e55]
NetworkManager: Frame 4: [0xffffe420]
NetworkManager: Frame 5: /usr/lib/libdbus-glib-1.so.2 [0xb7ef7bf0]
NetworkManager: ******************* END **********************************


Any hints?

diff -u -r1.2 nm-pptp-service.c
--- nm-pptp-service.c	16 Jan 2006 22:58:12 -0000	1.2
+++ nm-pptp-service.c	7 Feb 2006 19:57:05 -0000
@@ -418,6 +418,7 @@
     }
   }
 
+  g_ptr_array_add (pptp_argv, (gpointer) "require-mschap-v2");
   g_ptr_array_add (pptp_argv, (gpointer) "nodetach");
   g_ptr_array_add (pptp_argv, (gpointer) "lock");
   g_ptr_array_add (pptp_argv, (gpointer) "noauth");
@@ -442,11 +443,12 @@
       g_ptr_array_add (pptp_argv, (gpointer) "remotename");
       g_ptr_array_add (pptp_argv, (gpointer) data_items[++i]);
     } else if ( (strcmp( data_items[i], "encrypt-mppe" ) == 0) &&
-		(strcmp( data_items[i], "yes" ) == 0) ) {
-//      g_ptr_array_add (pptp_argv, (gpointer) "mppe required");
+		(strcmp( data_items[i+1], "yes" ) == 0) ) {
+      g_ptr_array_add (pptp_argv, (gpointer) "mppe");
+      g_ptr_array_add (pptp_argv, (gpointer) "required,stateless");
     } else if ( (strcmp( data_items[i], "comp-mppc" ) == 0) &&
-		(strcmp( data_items[i], "yes" ) == 0) ) {
-//      g_ptr_array_add (pptp_argv, (gpointer) "mppc required");
+		(strcmp( data_items[i+1], "yes" ) == 0) ) {
+      g_ptr_array_add (pptp_argv, (gpointer) "mppc");
     }
   }