summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2020-04-29 16:25:52 +0200
committerLennart Poettering <lennart@poettering.net>2020-04-29 16:32:46 +0200
commit560a3e5dd6ff12cfbe1cedfa8838dd8423a0dadd (patch)
tree5972da84b034fd25c4ac710d70cd326c0e7141c1
parent2ffee2c9b059e0988662fb14ab1b19450258fdb0 (diff)
downloadsystemd-560a3e5dd6ff12cfbe1cedfa8838dd8423a0dadd.tar.gz
home: make sure whenever we touch the 'secret' part of a user record, we set the the sensitive flag on it
-rw-r--r--src/home/user-record-util.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/home/user-record-util.c b/src/home/user-record-util.c
index c4a0d95081..430a952e6f 100644
--- a/src/home/user-record-util.c
+++ b/src/home/user-record-util.c
@@ -840,6 +840,8 @@ int user_record_set_password(UserRecord *h, char **password, bool prepend) {
if (r < 0)
return r;
+ json_variant_sensitive(w);
+
r = json_variant_set_field(&h->json, "secret", w);
if (r < 0)
return r;
@@ -900,6 +902,8 @@ int user_record_set_pkcs11_pin(UserRecord *h, char **pin, bool prepend) {
if (r < 0)
return r;
+ json_variant_sensitive(w);
+
r = json_variant_set_field(&h->json, "secret", w);
if (r < 0)
return r;
@@ -927,8 +931,11 @@ int user_record_set_pkcs11_protected_authentication_path_permitted(UserRecord *h
if (json_variant_is_blank_object(w))
r = json_variant_filter(&h->json, STRV_MAKE("secret"));
- else
+ else {
+ json_variant_sensitive(w);
+
r = json_variant_set_field(&h->json, "secret", w);
+ }
if (r < 0)
return r;