summaryrefslogtreecommitdiffstats
path: root/src/nspawn
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2019-01-08 18:48:48 +0100
committerLennart Poettering <lennart@poettering.net>2019-12-02 09:47:00 +0100
commitd642f640bf39f9086a24920d97808fa40159a372 (patch)
treea47df1d1a6b0f150b10d795c53428928d2540af0 /src/nspawn
parentjson: add json_parse_file_at() helper (diff)
downloadsystemd-d642f640bf39f9086a24920d97808fa40159a372.tar.xz
systemd-d642f640bf39f9086a24920d97808fa40159a372.zip
json: add flags parameter to json_parse_file(), for parsing "sensitive" data
This will call json_variant_sensitive() internally while parsing for each allocated sub-variant. This is better than calling it a posteriori at the end, because partially parsed variants will always be properly erased from memory this way.
Diffstat (limited to 'src/nspawn')
-rw-r--r--src/nspawn/nspawn-oci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nspawn/nspawn-oci.c b/src/nspawn/nspawn-oci.c
index 4519c74b95..ba8b142c99 100644
--- a/src/nspawn/nspawn-oci.c
+++ b/src/nspawn/nspawn-oci.c
@@ -2214,7 +2214,7 @@ int oci_load(FILE *f, const char *bundle, Settings **ret) {
path = strjoina(bundle, "/config.json");
- r = json_parse_file(f, path, &oci, &line, &column);
+ r = json_parse_file(f, path, 0, &oci, &line, &column);
if (r < 0) {
if (line != 0 && column != 0)
return log_error_errno(r, "Failed to parse '%s' at %u:%u: %m", path, line, column);