diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-30 12:51:06 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-30 12:51:06 +0100 |
commit | e8a18157bce8e0b0cbde5bd52aaf5ae0940297d3 (patch) | |
tree | 89fc1343a6302c7ee5d72774fde0f5b67d0b1927 /extra/kdebase-workspace/kde-np.pam | |
parent | 6d4537b67f90b1decadcf8434e1a5bdcb6694f7f (diff) | |
parent | 39711f3264d3b9de2ff6392649274d6333932457 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/arpack/PKGBUILD
extra/gtk2/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
staging/digikam/PKGBUILD
testing/curl/PKGBUILD
Diffstat (limited to 'extra/kdebase-workspace/kde-np.pam')
-rw-r--r-- | extra/kdebase-workspace/kde-np.pam | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/extra/kdebase-workspace/kde-np.pam b/extra/kdebase-workspace/kde-np.pam index 81eeef47b..dfedb8edf 100644 --- a/extra/kdebase-workspace/kde-np.pam +++ b/extra/kdebase-workspace/kde-np.pam @@ -4,4 +4,5 @@ auth required pam_permit.so account required pam_unix.so password required pam_unix.so session required pam_unix.so -session required pam_limits.so
\ No newline at end of file +session required pam_limits.so +-session optional pam_systemd.so |