? patch
? m4macros/Makefile
? m4macros/Makefile.in
? po/th.po
Index: network.pl.in
===================================================================
RCS file: /cvs/gnome/system-tools-backends/network.pl.in,v
retrieving revision 1.190
diff -u -r1.190 network.pl.in
--- network.pl.in	13 Feb 2005 18:25:43 -0000	1.190
+++ network.pl.in	13 Feb 2005 20:53:29 -0000
@@ -184,7 +184,7 @@
   $external_line = $$hash{"configuration"}{"external_line"};
   $dial_command  = $$hash{"configuration"}{"dial_command"};
 
-  $filename = gst_file_get_temp_name ("network-admin-chat-script-XXXXXXXXX");
+  $filename = &gst_file_get_temp_name ("network-admin-chat-script-XXXXXXXXX");
   $tmp_file = "/tmp/$filename";
 
   $dial  = $dial_command;
@@ -196,11 +196,6 @@
   &gst_replace_chat ($tmp_file, "atd[tp][0-9wW]+", $dial);
   &gst_network_set_modem_volume ($tmp_file, $volume);
 
-  $arr = &gst_file_buffer_load ($tmp_file);
-  push @$arr, "ogin:--ogin: " . $$hash{"configuration"}{"login"} . "\n";
-  push @$arr, "ssword: " . $$hash{"configuration"}{"password"} . "\n";
-  &gst_file_buffer_save ($arr, $tmp_file);
-
   return $tmp_file;
 }
 
@@ -220,10 +215,11 @@
   $command .= ($$config{"serial_hwctl"}) ? " crtscts" : " nocrtscts";
   $command .= ($$config{"set_default_gw"}) ? " defaultroute" : " nodefaultroute";
   $command .= " usepeerdns" if ($$config{"update_dns"});
-  $command .= " connect `$command_chat -f $chat_file`";
+  $command .= " user " . $$config{"login"};
+  $command .= " connect '$command_chat -f $chat_file'";
 
   $ret = &gst_file_run ($command);
-  
+
   # we don't want this file to have backup
   unlink $chat_file;
 
@@ -293,6 +289,10 @@
   {
     if (exists ($$hash{"configuration"}{"phone_number"}))
     {
+      # This sucks a bit, but it's better than putting the password in the pppd command line
+      &gst_network_set_pap_password ("etc/ppp/pap-secrets",  $$hash{"login"}, $$hash{"password"});
+      &gst_network_set_pap_password ("etc/ppp/chap-secrets", $$hash{"login"}, $$hash{"password"});
+
       if (&gst_network_check_pppd_plugin ("capiplugin"))
       {
         $ret = &gst_network_enable_isdn ($hash, $dev, $command_pppd);