aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-02-09 16:14:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

lightningd: allow false as a default for flags.

Browse Source 
defaults were deprecated in 0df97547dd, but that was a bit
harsh as several plugins do that (summary, for example).  So allow false, but warn
that we ignore anything else.

Reported-by: @microsatoshi on Discord.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Deprecated: Plugins: ...actually, `default` `false` still accepted on `flag` type parameters.
This commit is contained in:
Rusty Russell
2023-06-06 12:30:03 +09:30
parent 55119e6ca0
commit e457681f3a
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lightningd/plugin.c
View File

@@ -960,9 +960,22 @@ static const char *plugin_opt_add(struct plugin *plugin, const char *buffer,
if (json_tok_streq(buffer, typetok, "flag")) {
if (defaulttok) {
if (!deprecated_apis) {
return tal_fmt(plugin, "%s type flag cannot have default",
popt->name);
bool val;
/* We used to allow (ignore) anything, now make sure it's 'false' */
if (!json_to_bool(buffer, defaulttok, &val)
|| val != false) {
if (!deprecated_apis)
return tal_fmt(plugin, "%s type flag default must be 'false' not %.*s",
popt->name,
json_tok_full_len(defaulttok),
json_tok_full(buffer, defaulttok));
else {
/* At least warn that we're ignoring! */
log_broken(plugin->log, "Ignoring default %.*s for %s (if set, must be 'false'!)",
json_tok_full_len(defaulttok),
json_tok_full(buffer, defaulttok),
popt->name);
}
}
defaulttok = NULL;
}