Merge pull request #15442 from poettering/fido2

[thirdparty/systemd.git] / src / home / homework-directory.c

diff --git a/src/home/homework-directory.c b/src/home/homework-directory.c
index 8a4cb1732ac771749b53dd474724d6836e8503fe..7d00da214aa1a563ac0b8282a2775897b0a87582 100644 (file)
--- a/src/home/homework-directory.c
+++ b/src/home/homework-directory.c
@@ -26,7 +26,7 @@ int home_prepare_directory(UserRecord *h, bool already_activated, HomeSetup *set
 
 int home_activate_directory(
                 UserRecord *h,
 
 int home_activate_directory(
                 UserRecord *h,

-                char ***pkcs11_decrypted_passwords,
+                PasswordCache *cache,

                 UserRecord **ret_home) {
 
         _cleanup_(user_record_unrefp) UserRecord *new_home = NULL, *header_home = NULL;
                 UserRecord **ret_home) {
 
         _cleanup_(user_record_unrefp) UserRecord *new_home = NULL, *header_home = NULL;


@@ -44,11 +44,11 @@ int home_activate_directory(
         assert_se(hdo = user_record_home_directory(h));
         hd = strdupa(hdo);
 
         assert_se(hdo = user_record_home_directory(h));
         hd = strdupa(hdo);
 

-        r = home_prepare(h, false, pkcs11_decrypted_passwords, &setup, &header_home);
+        r = home_prepare(h, false, cache, &setup, &header_home);

         if (r < 0)
                 return r;
 
         if (r < 0)
                 return r;
 

-        r = home_refresh(h, &setup, header_home, pkcs11_decrypted_passwords, NULL, &new_home);
+        r = home_refresh(h, &setup, header_home, cache, NULL, &new_home);

         if (r < 0)
                 return r;
 
         if (r < 0)
                 return r;
 


@@ -193,7 +193,7 @@ int home_create_directory_or_subvolume(UserRecord *h, UserRecord **ret_home) {
 int home_resize_directory(
                 UserRecord *h,
                 bool already_activated,
 int home_resize_directory(
                 UserRecord *h,
                 bool already_activated,

-                char ***pkcs11_decrypted_passwords,
+                PasswordCache *cache,

                 HomeSetup *setup,
                 UserRecord **ret_home) {
 
                 HomeSetup *setup,
                 UserRecord **ret_home) {
 


@@ -205,11 +205,11 @@ int home_resize_directory(
         assert(ret_home);
         assert(IN_SET(user_record_storage(h), USER_DIRECTORY, USER_SUBVOLUME, USER_FSCRYPT));
 
         assert(ret_home);
         assert(IN_SET(user_record_storage(h), USER_DIRECTORY, USER_SUBVOLUME, USER_FSCRYPT));
 

-        r = home_prepare(h, already_activated, pkcs11_decrypted_passwords, setup, NULL);
+        r = home_prepare(h, already_activated, cache, setup, NULL);

         if (r < 0)
                 return r;
 
         if (r < 0)
                 return r;
 

-        r = home_load_embedded_identity(h, setup->root_fd, NULL, USER_RECONCILE_REQUIRE_NEWER_OR_EQUAL, pkcs11_decrypted_passwords, &embedded_home, &new_home);
+        r = home_load_embedded_identity(h, setup->root_fd, NULL, USER_RECONCILE_REQUIRE_NEWER_OR_EQUAL, cache, &embedded_home, &new_home);

         if (r < 0)
                 return r;
 
         if (r < 0)
                 return r;