1
=== removed file 'data/session.conf'
2
--- data/session.conf	2014-05-06 11:32:13 +0000
3
+++ data/session.conf	1970-01-01 00:00:00 +0000
4
@@ -1,42 +0,0 @@
5
1
<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
6
2
 "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
7
3
<busconfig>
8
4
  <!-- If we fork, keep the user's original umask to avoid affecting
9
5
       the behavior of child processes. -->
10
6
  <keep_umask/>
11
7
12
8
  <type>session</type>
13
9
14
10
  <listen>unix:tmpdir=/tmp</listen>
15
11
16
12
  <standard_session_servicedirs />
17
13
18
14
  <policy context="default">
19
15
    <!-- Allow everything to be sent -->
20
16
    <allow send_destination="*" eavesdrop="true"/>
21
17
    <!-- Allow everything to be received -->
22
18
    <allow eavesdrop="true"/>
23
19
    <!-- Allow anyone to own anything -->
24
20
    <allow own="*"/>
25
21
  </policy>
26
22
27
23
  <!-- raise the service start timeout to 40 seconds as it can timeout
28
24
       on the live cd on slow machines -->
29
25
  <limit name="service_start_timeout">60000</limit>
30
26
31
27
  <!-- the memory limits are 1G instead of say 4G because they can't exceed 32-bit signed int max -->
32
28
  <limit name="max_incoming_bytes">1000000000</limit>
33
29
  <limit name="max_outgoing_bytes">1000000000</limit>
34
30
  <limit name="max_message_size">1000000000</limit>
35
31
  <limit name="service_start_timeout">120000</limit>  
36
32
  <limit name="auth_timeout">240000</limit>
37
33
  <limit name="max_completed_connections">100000</limit>  
38
34
  <limit name="max_incomplete_connections">10000</limit>
39
35
  <limit name="max_connections_per_user">100000</limit>
40
36
  <limit name="max_pending_service_starts">10000</limit>
41
37
  <limit name="max_names_per_connection">50000</limit>
42
38
  <limit name="max_match_rules_per_connection">50000</limit>
43
39
  <limit name="max_replies_per_connection">50000</limit>
44
40
  <limit name="reply_timeout">300000</limit>
45
41
46
42
</busconfig>
47
43
0
48
=== removed file 'data/system.conf'
49
--- data/system.conf	2014-05-06 11:32:13 +0000
50
+++ data/system.conf	1970-01-01 00:00:00 +0000
51
@@ -1,23 +0,0 @@
52
1
<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
53
2
 "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
54
3
<busconfig>
55
4
  <!-- If we fork, keep the user's original umask to avoid affecting
56
5
       the behavior of child processes. -->
57
6
  <keep_umask/>
58
7
59
8
  <type>system</type>
60
9
61
10
  <listen>unix:tmpdir=/tmp</listen>
62
11
63
12
  <standard_system_servicedirs/>
64
13
65
14
  <policy context="default">
66
15
    <!-- Allow everything to be sent -->
67
16
    <allow send_destination="*" eavesdrop="true"/>
68
17
    <!-- Allow everything to be received -->
69
18
    <allow eavesdrop="true"/>
70
19
    <!-- Allow anyone to own anything -->
71
20
    <allow own="*"/>
72
21
  </policy>
73
22
74
23
</busconfig>
75
24
0
76
=== modified file 'src/core/trust/impl/sqlite3/store.cpp'
77
--- src/core/trust/impl/sqlite3/store.cpp	2014-06-26 07:09:51 +0000
78
+++ src/core/trust/impl/sqlite3/store.cpp	2014-07-16 21:34:23 +0000
79
@@ -50,10 +50,12 @@
80
50
{
50
{
81
51
    Directory(const std::string& name)
51
    Directory(const std::string& name)
82
52
    {
52
    {
83
53
        // Default permissions for directory creation.
84
54
        mode_t default_mode = 0755;
85
53
        // This is only a helper and we are consciously ignoring
55
        // This is only a helper and we are consciously ignoring
86
54
        // errors. We will fail later on when trying to opening the
56
        // errors. We will fail later on when trying to opening the
87
55
        // database, anyway.
57
        // database, anyway.
89
56
        mkdir(name.c_str(), 0777);
58
        mkdir(name.c_str(), default_mode);
90
57
    }
59
    }
91
58
};
60
};
92
59
61
93
60
62
94
=== modified file 'tests/CMakeLists.txt'
95
--- tests/CMakeLists.txt	2014-05-06 11:32:13 +0000
96
+++ tests/CMakeLists.txt	2014-07-16 21:34:23 +0000
97
@@ -12,10 +12,6 @@
98
12
12
99
13
add_definitions(-DCORE_DBUS_ENABLE_GOOGLE_TEST_FIXTURE)
13
add_definitions(-DCORE_DBUS_ENABLE_GOOGLE_TEST_FIXTURE)
100
14
14
101
15
configure_file(
102
16
  ${CMAKE_CURRENT_SOURCE_DIR}/test_data.h.in
103
17
  ${CMAKE_CURRENT_BINARY_DIR}/test_data.h @ONLY)
104
18
105
19
include_directories(
15
include_directories(
106
20
  ${CMAKE_CURRENT_BINARY_DIR}
16
  ${CMAKE_CURRENT_BINARY_DIR}
107
21
  ${GTEST_INCLUDE_DIRS}
17
  ${GTEST_INCLUDE_DIRS}
108
22
18
109
=== modified file 'tests/remote_trust_store_test.cpp'
110
--- tests/remote_trust_store_test.cpp	2014-05-06 11:32:13 +0000
111
+++ tests/remote_trust_store_test.cpp	2014-07-16 21:34:23 +0000
112
@@ -28,8 +28,6 @@
113
28
#include <core/testing/cross_process_sync.h>
28
#include <core/testing/cross_process_sync.h>
114
29
#include <core/testing/fork_and_run.h>
29
#include <core/testing/fork_and_run.h>
115
30
30
116
31
#include "test_data.h"
117
32
118
33
#include <gtest/gtest.h>
31
#include <gtest/gtest.h>
119
34
32
120
35
#include <chrono>
33
#include <chrono>
121
@@ -42,14 +40,6 @@
122
42
struct RemoteTrustStore : public core::dbus::testing::Fixture
40
struct RemoteTrustStore : public core::dbus::testing::Fixture
123
43
{
41
{
124
44
};
42
};
125
45
126
46
auto session_bus_config_file =
127
47
        core::dbus::testing::Fixture::default_session_bus_config_file() =
128
48
        core::testing::session_bus_configuration_file();
129
49
130
50
auto system_bus_config_file =
131
51
        core::dbus::testing::Fixture::default_system_bus_config_file() =
132
52
        core::testing::system_bus_configuration_file();
133
53
}
43
}
134
54
44
135
55
TEST_F(RemoteTrustStore, a_store_exposed_to_the_session_can_be_reset)
45
TEST_F(RemoteTrustStore, a_store_exposed_to_the_session_can_be_reset)
Reviewer	Review Type	Date Requested	Status
Seth Arnold (community)		2014-07-16	Approve on 2014-07-16
PS Jenkins bot	continuous-integration		Approve on 2014-07-16
Ubuntu Phablet Team		2014-07-16	Pending
Review via email: mp+226964@code.launchpad.net