← Back to branch summary

~mardy/signon/lp1415492-rtm

« back to all changes in this revision

Viewing changes to src/signond/signondaemonadaptor.cpp

  • Committer: CI bot
  • Author(s): Alberto Mardegan
  • Date: 2014-11-27 10:53:03 UTC
  • mfrom: (621.1.3 packaging)
  • Revision ID: ps-jenkins@lists.canonical.com-20141127105303-vy4hkvm75iyuqknv
Merge from upstream

Do not bypass the ACL checks if the Identity has no owner. Fixes: #1378660, #1392380
Approved by: PS Jenkins bot, David Barth

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/signond/signondaemonadaptor.cpp
172
172
 
173
173
    /* Access Control */
174
174
    if (id != SIGNOND_NEW_IDENTITY) {
175
 
        if (!acm->isPeerAllowedToUseAuthSession(conn, msg, id)) {
 
175
        if (!acm->isPeerAllowedToUseIdentity(conn, msg, id)) {
176
176
            SignOn::AccessReply *reply =
177
177
                acm->requestAccessToIdentity(conn, msg, id);
178
178
            /* If the request is accepted, we'll need the method name ("type")