Merge lp:~thomas-voss/trust-store/fix-mir-comments into lp:trust-store

[Thomas Voß]

Remove obsolete data/session.conf and data/system.conf files.
Adjust directory creation default mode to 0755.

Remove obsolete data/session.conf and data/system.conf files.
Adjust directory creation default mode to 0755.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:17
http://jenkins.qa.ubuntu.com/job/trust-store-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-armhf-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-i386-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/trust-store-ci/2/rebuild

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/trust-store/fix-mir-comments]

18. By Thomas Voß on 2014-07-16

Remove obsolete header file.

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/trust-store-ci/7/rebuild

review: Approve (continuous-integration)

[Seth Arnold (seth-arnold)]

Looks good to me, thanks!

review: Approve

=== removed file 'data/session.conf'
--- data/session.conf	2014-05-06 11:32:13 +0000
+++ data/session.conf	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-  <!-- If we fork, keep the user's original umask to avoid affecting
-       the behavior of child processes. -->
-  <keep_umask/>
-
-  <type>session</type>
-
-  <listen>unix:tmpdir=/tmp</listen>
-
-  <standard_session_servicedirs />
-
-  <policy context="default">
-    <!-- Allow everything to be sent -->
-    <allow send_destination="*" eavesdrop="true"/>
-    <!-- Allow everything to be received -->
-    <allow eavesdrop="true"/>
-    <!-- Allow anyone to own anything -->
-    <allow own="*"/>
-  </policy>
-
-  <!-- raise the service start timeout to 40 seconds as it can timeout
-       on the live cd on slow machines -->
-  <limit name="service_start_timeout">60000</limit>
-
-  <!-- the memory limits are 1G instead of say 4G because they can't exceed 32-bit signed int max -->
-  <limit name="max_incoming_bytes">1000000000</limit>
-  <limit name="max_outgoing_bytes">1000000000</limit>
-  <limit name="max_message_size">1000000000</limit>
-  <limit name="service_start_timeout">120000</limit>  
-  <limit name="auth_timeout">240000</limit>
-  <limit name="max_completed_connections">100000</limit>  
-  <limit name="max_incomplete_connections">10000</limit>
-  <limit name="max_connections_per_user">100000</limit>
-  <limit name="max_pending_service_starts">10000</limit>
-  <limit name="max_names_per_connection">50000</limit>
-  <limit name="max_match_rules_per_connection">50000</limit>
-  <limit name="max_replies_per_connection">50000</limit>
-  <limit name="reply_timeout">300000</limit>
-
-</busconfig>

=== removed file 'data/system.conf'
--- data/system.conf	2014-05-06 11:32:13 +0000
+++ data/system.conf	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-  <!-- If we fork, keep the user's original umask to avoid affecting
-       the behavior of child processes. -->
-  <keep_umask/>
-
-  <type>system</type>
-
-  <listen>unix:tmpdir=/tmp</listen>
-
-  <standard_system_servicedirs/>
-
-  <policy context="default">
-    <!-- Allow everything to be sent -->
-    <allow send_destination="*" eavesdrop="true"/>
-    <!-- Allow everything to be received -->
-    <allow eavesdrop="true"/>
-    <!-- Allow anyone to own anything -->
-    <allow own="*"/>
-  </policy>
-
-</busconfig>

=== modified file 'src/core/trust/impl/sqlite3/store.cpp'
--- src/core/trust/impl/sqlite3/store.cpp	2014-06-26 07:09:51 +0000
+++ src/core/trust/impl/sqlite3/store.cpp	2014-07-16 21:34:23 +0000
@@ -50,10 +50,12 @@
 {
     Directory(const std::string& name)
     {
+        // Default permissions for directory creation.
+        mode_t default_mode = 0755;
         // This is only a helper and we are consciously ignoring
         // errors. We will fail later on when trying to opening the
         // database, anyway.
-        mkdir(name.c_str(), 0777);
+        mkdir(name.c_str(), default_mode);
     }
 };
 

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-05-06 11:32:13 +0000
+++ tests/CMakeLists.txt	2014-07-16 21:34:23 +0000
@@ -12,10 +12,6 @@
 
 add_definitions(-DCORE_DBUS_ENABLE_GOOGLE_TEST_FIXTURE)
 
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_data.h.in
-  ${CMAKE_CURRENT_BINARY_DIR}/test_data.h @ONLY)
-
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${GTEST_INCLUDE_DIRS}

=== modified file 'tests/remote_trust_store_test.cpp'
--- tests/remote_trust_store_test.cpp	2014-05-06 11:32:13 +0000
+++ tests/remote_trust_store_test.cpp	2014-07-16 21:34:23 +0000
@@ -28,8 +28,6 @@
 #include <core/testing/cross_process_sync.h>
 #include <core/testing/fork_and_run.h>
 
-#include "test_data.h"
-
 #include <gtest/gtest.h>
 
 #include <chrono>
@@ -42,14 +40,6 @@
 struct RemoteTrustStore : public core::dbus::testing::Fixture
 {
 };
-
-auto session_bus_config_file =
-        core::dbus::testing::Fixture::default_session_bus_config_file() =
-        core::testing::session_bus_configuration_file();
-
-auto system_bus_config_file =
-        core::dbus::testing::Fixture::default_system_bus_config_file() =
-        core::testing::system_bus_configuration_file();
 }
 
 TEST_F(RemoteTrustStore, a_store_exposed_to_the_session_can_be_reset)