Qingfang DengandJonas Jelonek
b25d90b7e4
Update to 2.5.3 and use the official tarball. Changelog: https://github.com/ppp-project/ppp/releases/tag/v2.5.3 Removed upstreamed: - 000-pppd-session-fixed-building-with-gcc-15.patch - 001-pppdump-fixed-building-with-gcc-15.patch - 501-fix-memcpy-fortify.patch - 502-remove_mru.patch Manually rebased: - 500-add-pptp-plugin.patch Add a pending patch to relax the check to avoid breaking existing configurations. Signed-off-by: Qingfang Deng <dqfext@gmail.com> Link: https://github.com/openwrt/openwrt/pull/23540 Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
29 lines
1.1 KiB
Diff
29 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
|
|
@@ -392,13 +392,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 },
|