OpenWrt – Blame information for rev 3

Subversion Repositories:
Rev:
Rev Author Line No. Line
1 office 1 pppd: Support "nomp" option even if multilink support is off
2  
3 This patch moves the "nomp" option entry outside of the defines protecting
4 the multilink specific code. The motivation is to allow "nomp" even if pppd
5 does not support multilink, so that controlling programs can unconditionally
6 pass it to pppd regardless of the compile time features.
7  
8 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
9  
10 --- a/pppd/options.c
11 +++ b/pppd/options.c
3 office 12 @@ -336,13 +336,14 @@ option_t general_options[] = {
1 office 13 "Enable multilink operation", OPT_PRIOSUB | OPT_ALIAS | 1 },
14 { "nomultilink", o_bool, &multilink,
15 "Disable multilink operation", OPT_PRIOSUB | 0 },
16 - { "nomp", o_bool, &multilink,
17 - "Disable multilink operation", OPT_PRIOSUB | OPT_ALIAS | 0 },
18  
19 { "bundle", o_string, &bundle_name,
20 "Bundle name for multilink", OPT_PRIO },
21 #endif /* HAVE_MULTILINK */
22  
23 + { "nomp", o_bool, &multilink,
24 + "Disable multilink operation", OPT_PRIOSUB | OPT_ALIAS | 0 },
25 +
26 #ifdef PLUGIN
27 { "plugin", o_special, (void *)loadplugin,
28 "Load a plug-in module into pppd", OPT_PRIV | OPT_A2LIST },