homed: replace "already_activated" boolean parameter by a flags value

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

diff --git a/src/home/homework-fscrypt.c b/src/home/homework-fscrypt.c
index 037e4853fd349f1b9a98c532132681b2adf871e9..37903b8fff6303197c3ee33209467023fced4fda 100644 (file)
--- a/src/home/homework-fscrypt.c
+++ b/src/home/homework-fscrypt.c
@@ -278,9 +278,8 @@ static int fscrypt_setup(
         return log_error_errno(SYNTHETIC_ERRNO(ENOKEY), "Failed to set up home directory with provided passwords.");
 }
 
-int home_prepare_fscrypt(
+int home_setup_fscrypt(
                 UserRecord *h,
-                bool already_activated,
                 PasswordCache *cache,
                 HomeSetup *setup) {
 
@@ -550,7 +549,7 @@ int home_create_fscrypt(
         if (r < 0)
                 return r;
 
-        r = user_record_clone(h, USER_RECORD_LOAD_MASK_SECRET, &new_home);
+        r = user_record_clone(h, USER_RECORD_LOAD_MASK_SECRET|USER_RECORD_PERMISSIVE, &new_home);
         if (r < 0)
                 return log_error_errno(r, "Failed to clone record: %m");