diff --git a/debian/control b/debian/control index 118d855..4f60c2d 100644 --- a/debian/control +++ b/debian/control @@ -26,6 +26,7 @@ Depends: ${shlibs:Depends}, dde-seatd, treeland, libpam-systemd, +Recommends: deepin-keyring-whitebox, Description: a modern display manager for Wayland sessions aiming to be fast, simple and beautiful. Package: libddm diff --git a/services/ddm-autologin.pam b/services/ddm-autologin.pam index 8bc87e9..c9fb564 100644 --- a/services/ddm-autologin.pam +++ b/services/ddm-autologin.pam @@ -9,6 +9,9 @@ auth requisite pam_nologin.so # Load environment from /etc/environment auth required pam_env.so +# Unlock keyring when user auto login +-auth optional pam_deepin_keyring.so + # Allow access without authentication auth required pam_permit.so @@ -24,6 +27,7 @@ session required pam_limits.so session required pam_loginuid.so session required pam_systemd.so @include common-session +-session optional pam_deepin_keyring.so -session optional pam_gnome_keyring.so auto_start -session optional pam_kwallet5.so auto_start diff --git a/services/ddm.pam b/services/ddm.pam index c89c5a3..84f6dc6 100644 --- a/services/ddm.pam +++ b/services/ddm.pam @@ -4,6 +4,7 @@ auth sufficient pam_succeed_if.so user ingroup nopasswdlogin auth include system-login +-auth optional pam_deepin_keyring.so -auth optional pam_gnome_keyring.so -auth optional pam_kwallet5.so @@ -15,5 +16,6 @@ password include system-login session optional pam_keyinit.so force revoke session include system-login session required pam_systemd.so +-session optional pam_deepin_keyring.so -session optional pam_gnome_keyring.so auto_start -session optional pam_kwallet5.so auto_start diff --git a/services/debian.ddm.pam b/services/debian.ddm.pam index ddc5136..6b560ae 100644 --- a/services/debian.ddm.pam +++ b/services/debian.ddm.pam @@ -9,6 +9,7 @@ auth sufficient pam_succeed_if.so user ingroup nopasswdlogin @include common-auth # gnome_keyring breaks QProcess +-auth optional pam_deepin_keyring.so -auth optional pam_gnome_keyring.so -auth optional pam_kwallet5.so @@ -28,6 +29,7 @@ session required pam_systemd.so # in the proper default security context. Only sessions which are intended # to run in the user's context should be run after this. session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open +-session optional pam_deepin_keyring.so -session optional pam_gnome_keyring.so auto_start -session optional pam_kwallet5.so auto_start