]> git.proxmox.com Git - mirror_lxc.git/commitdiff
Merge pull request #2148 from brauner/2018-02-09/move_pam_module_to_liblxc
authorSerge Hallyn <serge@hallyn.com>
Wed, 21 Feb 2018 19:27:59 +0000 (13:27 -0600)
committerGitHub <noreply@github.com>
Wed, 21 Feb 2018 19:27:59 +0000 (13:27 -0600)
pam: create writable cgroups for unpriv users

1  2 
configure.ac
src/lxc/Makefile.am

diff --cc configure.ac
index 224e1f15e0b395b93f7cdafbf4dc397a7b513089,c16a57cec6b30ce0480b535919aa622d4c4687c0..26bbe28e0067608d229cc3a871c11a2631edbee0
@@@ -925,7 -994,11 +954,10 @@@ Security features
   - Linux capabilities: $enable_capabilities
   - seccomp: $enable_seccomp
   - SELinux: $enable_selinux
 - - cgmanager: $enable_cgmanager
  
+ PAM:
+  - cgroup PAM module: $pamdir
  Bindings:
   - lua: $enable_lua
   - python3: $enable_python
Simple merge