diff --git a/ChangeLog b/ChangeLog index e4101e797..2fa15f1dc 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 25053831b..661b4f81a 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");