Merge remote-tracking branch 'lass/21.11' into 21.11

1 files changed, 8 insertions, 9 deletions

diff --git a/lass/3modules/usershadow.nix b/lass/3modules/usershadow.nix
index c3d4de84..b1011ced 100644
--- a/lass/3modules/usershadow.nix
+++ b/lass/3modules/usershadow.nix
@@ -28,23 +28,22 @@
       session required pam_permit.so
     '';
 
-    security.pam.services.dovecot2 = {
-      text = ''
-        auth required pam_exec.so expose_authtok /run/wrappers/bin/shadow_verify_pam ${cfg.pattern}
-        auth required pam_permit.so
-        account required pam_permit.so
-        session required pam_permit.so
-        session required pam_env.so envfile=${config.system.build.pamEnvironment}
-      '';
-    };
+    security.pam.services.dovecot2.text = ''
+      auth required pam_exec.so expose_authtok /run/wrappers/bin/shadow_verify_pam ${cfg.pattern}
+      auth required pam_permit.so
+      account required pam_permit.so
+      session required pam_permit.so
+    '';
 
     security.wrappers.shadow_verify_pam = {
       source = "${usershadow}/bin/verify_pam";
       owner = "root";
+      group = "root";
     };
     security.wrappers.shadow_verify_arg = {
       source = "${usershadow}/bin/verify_arg";
       owner = "root";
+      group = "root";
     };
   };