summaryrefslogtreecommitdiffstats
path: root/src/home/homework-cifs.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2021-11-24 18:31:51 +0100
committerLennart Poettering <lennart@poettering.net>2021-11-24 18:31:51 +0100
commit6f2c813667018cc54f127a15a578a74071b0fa24 (patch)
tree8a680e0082ce966e94b070f36f64533d1839822d /src/home/homework-cifs.c
parenthomework: fix message typo (diff)
downloadsystemd-6f2c813667018cc54f127a15a578a74071b0fa24.tar.xz
systemd-6f2c813667018cc54f127a15a578a74071b0fa24.zip
homework: don't try to shift uidmap for already activated home areas
When we want to operate on an already activated home area we so far tried to reapply the uidmapping logic. We shouldn't do that, it's already applied after all. We only want to apply this for newly activated home areas. Hence check for the right HomeSetupFlags flag for it HOME_SETUP_ALREADY_ACTIVATED. The patch is actually in theory a two-liner. Except that so far we don#t pass the HomeSetupFlags flags down all necessary functions where the uidmap stuff will eventually run. Hence this larger than intended commit.
Diffstat (limited to 'src/home/homework-cifs.c')
-rw-r--r--src/home/homework-cifs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/home/homework-cifs.c b/src/home/homework-cifs.c
index b49b7b3dcd..ed06d1f221 100644
--- a/src/home/homework-cifs.c
+++ b/src/home/homework-cifs.c
@@ -145,6 +145,7 @@ int home_setup_cifs(
int home_activate_cifs(
UserRecord *h,
+ HomeSetupFlags flags,
HomeSetup *setup,
PasswordCache *cache,
UserRecord **ret_home) {
@@ -165,7 +166,7 @@ int home_activate_cifs(
if (r < 0)
return r;
- r = home_refresh(h, setup, header_home, cache, NULL, &new_home);
+ r = home_refresh(h, flags, setup, header_home, cache, NULL, &new_home);
if (r < 0)
return r;