f8b58757d0
0d004db Revert "pppd: Include time.h before using time_t" e400854 pppdump: Eliminate printf format warning by using %zd 7f2f0de pppd: Refactor setjmp/longjmp with pipe pair in event wait loop 4e71317 make: Avoid using host include for cross-compiling 3202f89 pppoe: Remove the use of cdefs d8e8d7a pppd: Remove unused rcsid variables 486f854 pppd: Fix GLIBC version test for non-glibc toolchains b6cd558 pppd: Include time.h before using time_t ef8ec11 radius: Fix compiler warning f6330ec magic: Remove K&R style of arguments 347904e Add Submitting-patches.md Remove patches 130-no_cdefs_h.patch, 131-missing_prototype_macro.patch, 132-fix_linux_includes.patch as fixed upstream Refresh patches Signed-off-by: Hans Dedecker <dedeckeh@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
|
|
@@ -349,13 +349,14 @@ option_t 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 /* HAVE_MULTILINK */
|
|
|
|
+ { "nomp", o_bool, &multilink,
|
|
+ "Disable multilink operation", OPT_PRIOSUB | OPT_ALIAS | 0 },
|
|
+
|
|
#ifdef PLUGIN
|
|
{ "plugin", o_special, (void *)loadplugin,
|
|
"Load a plug-in module into pppd", OPT_PRIV | OPT_A2LIST },
|