3e668c6d02
ChangeLog: https://github.com/ppp-project/ppp/blob/ppp-2.5.1/ChangeLog Suppressed patches: 010-use_target_for_configure.patch [1] 510-pptp_compile_fix.patch [2] 520-u_int_bsd_fix.patch [3] Upstreamed patches: 330-retain_foreign_default_routes.patch [4] 521-remove_unused_openssl_dep.patch [5] [1]e48a9b5de4[2] Merged into "500-add-pptp-plugin.patch" [3]797cdae57c[4]9856f47063[5]59342ab622Signed-off-by: Shiji Yang <yangshiji66@qq.com> Link: https://github.com/openwrt/openwrt/pull/16605 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
pppd: Support "nomp" option even if multilink support is off
|
|
|
|
This patch moves the "nomp" option entry outside of the defines protecting
|
|
the multilink specific code. The motivation is to allow "nomp" even if pppd
|
|
does not support multilink, so that controlling programs can unconditionally
|
|
pass it to pppd regardless of the compile time features.
|
|
|
|
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
|
|
|
|
--- a/pppd/options.c
|
|
+++ b/pppd/options.c
|
|
@@ -379,13 +379,14 @@ struct option general_options[] = {
|
|
"Enable multilink operation", OPT_PRIOSUB | OPT_ALIAS | 1 },
|
|
{ "nomultilink", o_bool, &multilink,
|
|
"Disable multilink operation", OPT_PRIOSUB | 0 },
|
|
- { "nomp", o_bool, &multilink,
|
|
- "Disable multilink operation", OPT_PRIOSUB | OPT_ALIAS | 0 },
|
|
|
|
{ "bundle", o_string, &bundle_name,
|
|
"Bundle name for multilink", OPT_PRIO },
|
|
#endif /* PPP_WITH_MULTILINK */
|
|
|
|
+ { "nomp", o_bool, &multilink,
|
|
+ "Disable multilink operation", OPT_PRIOSUB | OPT_ALIAS | 0 },
|
|
+
|
|
#ifdef PPP_WITH_PLUGINS
|
|
{ "plugin", o_special, (void *)loadplugin,
|
|
"Load a plug-in module into pppd", OPT_PRIV | OPT_A2LIST },
|