From d095a32ee2bc4de8984c8c3ae39ebff99152e6c8 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 16 Apr 2008 19:48:15 +0000 Subject: [PATCH] 2008-04-16 Dan Williams MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch from 陈鑫 * src/ppp-manager/nm-ppp-manager.c - (create_pppd_cmd_line): fix argument generation when spawning pppd git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3568 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 7 +++++++ src/ppp-manager/nm-ppp-manager.c | 18 +++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index e4101e7978..2fa15f1dc1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-04-16 Dan Williams + + Patch from 陈鑫 + + * src/ppp-manager/nm-ppp-manager.c + - (create_pppd_cmd_line): fix argument generation when spawning pppd + 2008-04-16 Dan Williams Patch from 陈鑫 diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index 25053831b8..661b4f81a0 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -525,23 +525,23 @@ create_pppd_cmd_line (NMSettingPPP *setting, if (setting->noauth) nm_cmd_line_add_string (cmd, "noauth"); - if (setting->noauth) - nm_cmd_line_add_string (cmd, "refuse-eap"); if (setting->refuse_eap) - nm_cmd_line_add_string (cmd, "refuse-chap"); + nm_cmd_line_add_string (cmd, "refuse-eap"); if (setting->refuse_chap) - nm_cmd_line_add_string (cmd, "refuse-mschap"); + nm_cmd_line_add_string (cmd, "refuse-chap"); if (setting->refuse_mschap) - nm_cmd_line_add_string (cmd, "nobsdcomp"); + nm_cmd_line_add_string (cmd, "refuse-mschap"); if (setting->nobsdcomp) - nm_cmd_line_add_string (cmd, "nodeflate"); + nm_cmd_line_add_string (cmd, "nobsdcomp"); if (setting->nodeflate) - nm_cmd_line_add_string (cmd, "require-mppe"); + nm_cmd_line_add_string (cmd, "nodeflate"); if (setting->require_mppe) - nm_cmd_line_add_string (cmd, "require-mppe-128"); + nm_cmd_line_add_string (cmd, "require-mppe"); if (setting->require_mppe_128) - nm_cmd_line_add_string (cmd, "mppe-stateful"); + nm_cmd_line_add_string (cmd, "require-mppe-128"); if (setting->mppe_stateful) + nm_cmd_line_add_string (cmd, "mppe-stateful"); + if (setting->require_mppc) nm_cmd_line_add_string (cmd, "require-mppc"); if (setting->crtscts) nm_cmd_line_add_string (cmd, "crtscts");