1
=== modified file 'tests/acceptance-tests/test_client_authorization.cpp'
2
--- tests/acceptance-tests/test_client_authorization.cpp	2015-06-25 03:00:08 +0000
3
+++ tests/acceptance-tests/test_client_authorization.cpp	2015-08-10 10:28:07 +0000
4
@@ -64,15 +64,18 @@
5
64
    struct SharedRegion
64
    struct SharedRegion
6
65
    {
65
    {
7
66
        sem_t client_creds_set;
66
        sem_t client_creds_set;
11
67
        pid_t client_pid;
67
        pid_t client_pid = -1;
12
68
        uid_t client_uid;
68
        uid_t client_uid = -1;
13
69
        gid_t client_gid;
69
        gid_t client_gid = -1;
14
70
70
15
71
        bool matches_client_process_creds(mf::SessionCredentials const& creds)
71
        bool matches_client_process_creds(mf::SessionCredentials const& creds)
16
72
        {
72
        {
17
73
            // A perfect match is perfect. But sometimes it's not a perfect
18
74
            // match and that's OK too. Because fakeroot (used in deb builds)
19
75
            // returns 0 unconditionally, even for non-root users.
20
73
            return client_pid == creds.pid() &&
76
            return client_pid == creds.pid() &&
23
74
                   client_uid == creds.uid() &&
77
                   (client_uid == 0 || client_uid == creds.uid()) &&
24
75
                   client_gid == creds.gid();
78
                   (client_gid == 0 || client_gid == creds.gid());
25
76
        }
79
        }
26
77
80
27
78
        bool wait_for_client_creds()
81
        bool wait_for_client_creds()
Reviewer	Review Type	Date Requested	Status
Kevin DuBois (community)			Approve on 2015-08-10
Cemil Azizoglu (community)		2015-08-10	Approve on 2015-08-10
PS Jenkins bot (community)	continuous-integration		Approve on 2015-08-10
Review via email: mp+267497@code.launchpad.net