Unity

Merge lp:~unity-team/unity/trusty-1305440 into lp:unity/7.2

  1. trusty-1305440
  2. Merge into trusty
Proposed by Stephen M. Webb
Status: Rejected
Rejected by: Stephen M. Webb
Proposed branch: lp:~unity-team/unity/trusty-1305440
Merge into: lp:unity/7.2
Diff against target: 84 lines (+15/-3)
8 files modified
CMakeLists.txt (+1/-0)
data/CMakeLists.txt (+1/-0)
data/pam/CMakeLists.txt (+1/-0)
data/pam/unity (+2/-0)
debian/changelog (+7/-0)
debian/rules (+1/-1)
debian/unity.install (+1/-0)
lockscreen/UserAuthenticatorPam.cpp (+1/-2)
To merge this branch: bzr merge lp:~unity-team/unity/trusty-1305440
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+244067@code.launchpad.net

Commit message

allow a distinct pam config file for greeter and for lock-screen

Description of the change

Allow a distinct pam config file for greeter and for lock-screen. Fixes: 1305440

This change is cherry-picked from trunk for SRUing in Ubuntu 14.04 LTS.

To post a comment you must log in.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-10-29 16:43:57 +0000
3+++ CMakeLists.txt 2014-12-08 22:56:09 +0000
4@@ -259,6 +259,7 @@
5 add_subdirectory(unity-shared)
6 add_subdirectory(dash)
7 add_subdirectory(launcher)
8+add_subdirectory(data)
9 if (ENABLE_X_SUPPORT)
10 add_subdirectory(hud)
11 add_subdirectory(lockscreen)
12
13=== added directory 'data'
14=== added file 'data/CMakeLists.txt'
15--- data/CMakeLists.txt 1970-01-01 00:00:00 +0000
16+++ data/CMakeLists.txt 2014-12-08 22:56:09 +0000
17@@ -0,0 +1,1 @@
18+add_subdirectory(pam)
19\ No newline at end of file
20
21=== added directory 'data/pam'
22=== added file 'data/pam/CMakeLists.txt'
23--- data/pam/CMakeLists.txt 1970-01-01 00:00:00 +0000
24+++ data/pam/CMakeLists.txt 2014-12-08 22:56:09 +0000
25@@ -0,0 +1,1 @@
26+install(FILES unity DESTINATION ${CMAKE_SYSCONFDIR}/pam.d)
27\ No newline at end of file
28
29=== added file 'data/pam/unity'
30--- data/pam/unity 1970-01-01 00:00:00 +0000
31+++ data/pam/unity 2014-12-08 22:56:09 +0000
32@@ -0,0 +1,2 @@
33+@include common-auth
34+auth optional pam_gnome_keyring.so
35
36=== modified file 'debian/changelog'
37--- debian/changelog 2014-08-26 13:49:00 +0000
38+++ debian/changelog 2014-12-08 22:56:09 +0000
39@@ -1,3 +1,10 @@
40+unity (7.2.3+14.04.20140826-0ubuntu2) UNRELEASED; urgency=medium
41+
42+ * Allow a distinct pam config file for greeter and for lock-screen.
43+ (lp: #1305440)
44+
45+ -- Andrea Azzarone <azzaronea@gmail.com> Mon, 08 Dec 2014 17:52:09 -0500
46+
47 unity (7.2.3+14.04.20140826-0ubuntu1) trusty; urgency=medium
48
49 [ Andrea Azzarone ]
50
51=== modified file 'debian/rules'
52--- debian/rules 2014-05-12 18:04:20 +0000
53+++ debian/rules 2014-12-08 22:56:09 +0000
54@@ -23,7 +23,7 @@
55
56 SCOPES_RECOMMENDS := $(shell perl debian/scopes-recommends-generator /usr/share/unity/client-scopes.json)
57
58-cmake_base_options := -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package
59+cmake_base_options := -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCMAKE_SYSCONFDIR=/etc -DCOMPIZ_PLUGIN_INSTALL_TYPE=package
60 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
61 cmake_gl_options := -DBUILD_GLES=TRUE -DDISABLE_MAINTAINER_CFLAGS=ON
62 endif
63
64=== modified file 'debian/unity.install'
65--- debian/unity.install 2011-09-15 16:42:23 +0000
66+++ debian/unity.install 2014-12-08 22:56:09 +0000
67@@ -1,3 +1,4 @@
68+etc/pam.d
69 usr/bin
70 usr/lib/compiz
71 usr/share/man/*/unity.1
72
73=== modified file 'lockscreen/UserAuthenticatorPam.cpp'
74--- lockscreen/UserAuthenticatorPam.cpp 2014-03-24 00:16:06 +0000
75+++ lockscreen/UserAuthenticatorPam.cpp 2014-12-08 22:56:09 +0000
76@@ -70,8 +70,7 @@
77 conversation.conv = ConversationFunction;
78 conversation.appdata_ptr = static_cast<void*>(this);
79
80- // FIXME (andy) We should install our own unityshell pam file.
81- return pam_start("lightdm", username_.c_str(),
82+ return pam_start("unity", username_.c_str(),
83 &conversation, &pam_handle_) == PAM_SUCCESS;
84 }
85

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: