From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 21 Oct 2021 16:40:39 +0000 (+0200)
Subject: homework: pass header user record in home_activate_cifs()
X-Git-Tag: v250-rc1~396^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de7df6c3a6d533c9702b0c7cb8f337ac8c741a04;p=thirdparty%2Fsystemd.git

homework: pass header user record in home_activate_cifs()

Of course unlike in the LUKS case there's not actually any user record
stored in the LUKS header, so what we pass here will always be NULL.

The reason why I am changing is to make this more alike the other
home_activate_xyz() calls, and passing this around doesn't hurt.

(A later commit will replace all backend-specific home_activate_xyz()
calls by a single one)
---

diff --git a/src/home/homework-cifs.c b/src/home/homework-cifs.c
index 896b1bf78be..43e0ad5c1ed 100644
--- a/src/home/homework-cifs.c
+++ b/src/home/homework-cifs.c
@@ -104,7 +104,7 @@ int home_activate_cifs(
                 PasswordCache *cache,
                 UserRecord **ret_home) {
 
-        _cleanup_(user_record_unrefp) UserRecord *new_home = NULL;
+        _cleanup_(user_record_unrefp) UserRecord *new_home = NULL, *header_home = NULL;
         const char *hdo, *hd;
         int r;
 
@@ -119,11 +119,11 @@ int home_activate_cifs(
         assert_se(hdo = user_record_home_directory(h));
         hd = strdupa_safe(hdo); /* copy the string out, since it might change later in the home record object */
 
-        r = home_setup_cifs(h, 0, setup);
+        r = home_setup(h, 0, cache, setup, &header_home);
         if (r < 0)
                 return r;
 
-        r = home_refresh(h, setup, NULL, cache, NULL, &new_home);
+        r = home_refresh(h, setup, header_home, cache, NULL, &new_home);
         if (r < 0)
                 return r;