2012-06-19 17:03:24 +00:00
|
|
|
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 <jow@openwrt.org>
|
|
|
|
|
|
2011-04-12 18:29:28 +00:00
|
|
|
--- a/pppd/options.c
|
|
|
|
|
+++ b/pppd/options.c
|
2011-10-20 21:42:07 +00:00
|
|
|
@@ -318,13 +318,14 @@ option_t general_options[] = {
|
2011-04-12 18:29:28 +00:00
|
|
|
"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 },
|
