Online Accounts: Sign-on daemon

Merge lp:~online-accounts/signon/packaging into lp:signon

  1. packaging
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Merged
Approved by: David Barth
Approved revision: no longer in the source branch.
Merged at revision: 620
Proposed branch: lp:~online-accounts/signon/packaging
Merge into: lp:signon
Diff against target: 27 lines (+6/-0)
2 files modified
lib/plugins/SignOn/uisessiondata_priv.h (+3/-0)
src/signond/signonsessioncore.cpp (+3/-0)
To merge this branch: bzr merge lp:~online-accounts/signon/packaging
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
David Barth (community) Approve
Review via email: mp+237211@code.launchpad.net

Commit message

Sync from upstream

Pass client PID to SignOn UI.

Description of the change

Sync from upstream

Pass client PID to SignOn UI.

To post a comment you must log in.
Revision history for this message
David Barth (dbarth) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:620
http://jenkins.qa.ubuntu.com/job/signon-ci/64/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-utopic-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-utopic-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/signon-utopic-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-utopic-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/signon-ci/64/rebuild

review: Approve (continuous-integration)
lp:~online-accounts/signon/packaging updated
620. By Alberto Mardegan

Sync from upstream

Pass client PID to SignOn UI.
Approved by: PS Jenkins bot, David Barth

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/plugins/SignOn/uisessiondata_priv.h'
2--- lib/plugins/SignOn/uisessiondata_priv.h 2012-10-25 12:58:10 +0000
3+++ lib/plugins/SignOn/uisessiondata_priv.h 2014-10-06 07:12:30 +0000
4@@ -66,6 +66,9 @@
5 #define SSOUI_KEY_METHOD QLatin1String("Method")
6 #define SSOUI_KEY_MECHANISM QLatin1String("Mechanism")
7
8+/* Process ID of the client application */
9+#define SSOUI_KEY_PID QLatin1String("Pid")
10+
11 #define SSOUI_KEY_SLOT_ACCEPT "accept"
12 #define SSOUI_KEY_SLOT_REJECT "reject"
13 #define SSOUI_KEY_SLOT_REFRESH "refresh"
14
15=== modified file 'src/signond/signonsessioncore.cpp'
16--- src/signond/signonsessioncore.cpp 2013-12-10 08:58:27 +0000
17+++ src/signond/signonsessioncore.cpp 2014-10-06 07:12:30 +0000
18@@ -705,6 +705,9 @@
19 request.m_params[SSOUI_KEY_CLIENT_DATA] = m_clientData;
20 request.m_params[SSOUI_KEY_METHOD] = m_method;
21 request.m_params[SSOUI_KEY_MECHANISM] = request.m_mechanism;
22+ request.m_params[SSOUI_KEY_PID] =
23+ AccessControlManagerHelper::instance()->pidOfPeer(request.m_conn,
24+ request.m_msg);
25
26 CredentialsAccessManager *camManager =
27 CredentialsAccessManager::instance();

Subscribers

No one subscribed via source and target branches