Merge lp:~mterry/lightdm/pam-tty into lp:lightdm

Proposed by Michael Terry on 2012-01-04
Status: Merged
Approved by: Robert Ancell on 2012-01-09
Approved revision: 1340
Merged at revision: 1342
Proposed branch: lp:~mterry/lightdm/pam-tty
Merge into: lp:lightdm
Diff against target: 14 lines (+4/-0)
1 file modified
src/greeter.c (+4/-0)
To merge this branch: bzr merge lp:~mterry/lightdm/pam-tty
Reviewer Review Type Date Requested Status
LightDM Development Team 2012-01-04 Pending
Review via email: mp+87432@code.launchpad.net

Description of the change

Sets PAM_TTY so that when pam wants to prompt for things like changing passwords it can.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/greeter.c'
2--- src/greeter.c 2011-11-29 04:42:03 +0000
3+++ src/greeter.c 2012-01-04 04:39:25 +0000
4@@ -306,6 +306,10 @@
5
6 g_signal_connect (G_OBJECT (greeter->priv->authentication), "got-messages", G_CALLBACK (pam_messages_cb), greeter);
7 g_signal_connect (G_OBJECT (greeter->priv->authentication), "authentication-result", G_CALLBACK (authentication_result_cb), greeter);
8+
9+ pam_session_set_item (greeter->priv->authentication, PAM_TTY,
10+ session_get_env (greeter->priv->session, "DISPLAY"));
11+
12 result = pam_session_authenticate (greeter->priv->authentication, &error);
13 if (error)
14 g_debug ("Failed to start authentication: %s", error->message);

Subscribers

People subscribed via source and target branches