diff options
author | Lennart Poettering <lennart@poettering.net> | 2021-05-31 21:55:44 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2021-06-01 13:32:31 +0200 |
commit | bfc0cc1a2506eb2327dca8e1a474be51634e8ab9 (patch) | |
tree | 51c0e7a5b722bd442e842894d95a53ae22824f22 /src/home/homed-manager-bus.c | |
parent | 17e7561a973495992014dd102135f15eb808ae01 (diff) | |
download | systemd-bfc0cc1a2506eb2327dca8e1a474be51634e8ab9.tar.gz |
userdb: make most loading of JSON user record data "permissive"
We want user records to be extensible, hence we shouldn't complain about
fields we can't parse. In particular we want them to be extensible for
our own future extensions.
Some code already turned the permissive flag when parsing the JSON data,
but most did not. Fix that. A few select cases remain where the bit is
not set: where we just gnerated the JSON data ourselves, and thus can be
reasonably sure that if we can't parse it it's our immediate programming
error and not just us processing a user record from some other tool or a
newer version of ourselves.
Diffstat (limited to 'src/home/homed-manager-bus.c')
-rw-r--r-- | src/home/homed-manager-bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/home/homed-manager-bus.c b/src/home/homed-manager-bus.c index 8a06bb62bf..7ac5b8d0fc 100644 --- a/src/home/homed-manager-bus.c +++ b/src/home/homed-manager-bus.c @@ -398,7 +398,7 @@ static int method_register_home( assert(message); assert(m); - r = bus_message_read_home_record(message, USER_RECORD_LOAD_EMBEDDED, &hr, error); + r = bus_message_read_home_record(message, USER_RECORD_LOAD_EMBEDDED|USER_RECORD_PERMISSIVE, &hr, error); if (r < 0) return r; @@ -513,7 +513,7 @@ static int method_update_home(sd_bus_message *message, void *userdata, sd_bus_er assert(message); assert(m); - r = bus_message_read_home_record(message, USER_RECORD_REQUIRE_REGULAR|USER_RECORD_ALLOW_SECRET|USER_RECORD_ALLOW_PRIVILEGED|USER_RECORD_ALLOW_PER_MACHINE|USER_RECORD_ALLOW_SIGNATURE, &hr, error); + r = bus_message_read_home_record(message, USER_RECORD_REQUIRE_REGULAR|USER_RECORD_ALLOW_SECRET|USER_RECORD_ALLOW_PRIVILEGED|USER_RECORD_ALLOW_PER_MACHINE|USER_RECORD_ALLOW_SIGNATURE|USER_RECORD_PERMISSIVE, &hr, error); if (r < 0) return r; |