Skip to content

[Next] cs_user.py: Switch from pam passwd to system-auth or common-auth with login fallback #13239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leigh123linux wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −2
Open

[Next] cs_user.py: Switch from pam passwd to system-auth or common-auth with login fallback #13239

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,13 +374,23 @@ def _on_new_password_icon_released(self, widget, icon_pos, event):
def _on_show_password_toggled(self, widget):
self.set_passwords_visibility()

def _get_pam_service(self):
import os
if os.path.exists('/etc/pam.d/system-auth'):
return 'system-auth'
elif os.path.exists('/etc/pam.d/common-auth'):
return 'common-auth'
else:
return 'login'

def auth_pam(self):
if not pam.pam().authenticate(GLib.get_user_name(), self.current_password.get_text(), 'passwd'):
service = self._get_pam_service()
if not pam.pam().authenticate(GLib.get_user_name(), self.current_password.get_text(), service):
raise PasswordError("Invalid password")

def auth_PyPAM(self):
auth = PAM.pam()
auth.start('passwd')
auth.start(self._get_pam_service())
auth.set_item(PAM.PAM_USER, GLib.get_user_name())
auth.set_item(PAM.PAM_CONV, self.pam_conv)
try:
Expand Down
Loading