refactoring: make bus type a type instead of boolsandbox/mbloch/constexpr

Change-Id: Idadba8b5d9aa5cb7b801be89b08699c53767905f

14 files changed, 63 insertions, 67 deletions

diff --git a/src/internal/internal.cpp b/src/internal/internal.cpp
index d38f277..a655f48 100755
--- a/src/internal/internal.cpp
+++ b/src/internal/internal.cpp
@@ -34,7 +34,7 @@ static const char* get_str(const char* const szstr) {
 	return (szstr != NULL) ? szstr : "";
 }
 
-int __internal_init(bool bus_type, const char* const config_name)
+int __internal_init(BusType bus_type, const char* const config_name)
 {
 	policy_checker().clearDb(bus_type);
 	auto err = static_parser().parsePolicy(bus_type, get_str(config_name));
@@ -45,7 +45,7 @@ int __internal_init(bool bus_type, const char* const config_name)
 
 pthread_mutex_t g_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-void memory_dump(bool bus_type)
+void memory_dump(BusType bus_type)
 {
 	policy_checker().printContent(bus_type);
 }
@@ -64,7 +64,7 @@ void __internal_init_flush_logs()
 	}
 }
 
-void __internal_init_sup_group(bool bus_type, uid_t uid, gid_t gid)
+void __internal_init_sup_group(BusType bus_type, uid_t uid, gid_t gid)
 {
 	policy_checker().updateGroupDb(bus_type, uid, gid);
 }
@@ -80,7 +80,7 @@ void __internal_exit()
 		pthread_mutex_unlock(&g_mutex);
 }
 
-int __internal_can_open(bool bus_type,
+int __internal_can_open(BusType bus_type,
 						uid_t bus_owner,
 						uid_t user,
 						gid_t group,
@@ -89,7 +89,7 @@ int __internal_can_open(bool bus_type,
 	return static_cast<int>(policy_checker().check(bus_type, bus_owner, user, group, label));
 }
 
-int __internal_can_send(bool bus_type,
+int __internal_can_send(BusType bus_type,
 						const uid_t user,
 						const gid_t group,
 						const char* const label,
@@ -107,7 +107,7 @@ int __internal_can_send(bool bus_type,
 	return static_cast<int>(policy_checker().check(bus_type, user, group, label, matcher));
 }
 
-int __internal_can_send_multi_dest(bool bus_type,
+int __internal_can_send_multi_dest(BusType bus_type,
 								   const uid_t user,
 								   const gid_t group,
 								   const char* const label,
@@ -126,7 +126,7 @@ int __internal_can_send_multi_dest(bool bus_type,
 	return static_cast<int>(policy_checker().check(bus_type, user, group, label, matcher));
 }
 
-int __internal_can_recv(bool bus_type,
+int __internal_can_recv(BusType bus_type,
 						const uid_t user,
 						const gid_t group,
 						const char* const label,
@@ -144,7 +144,7 @@ int __internal_can_recv(bool bus_type,
 	return static_cast<int>(policy_checker().check(bus_type, user, group, label, matcher));
 }
 
-int __internal_can_recv_multi(bool bus_type,
+int __internal_can_recv_multi(BusType bus_type,
 	const uid_t user,
 	const gid_t group,
 	const char* const label,
@@ -164,7 +164,7 @@ int __internal_can_recv_multi(bool bus_type,
 }
 
 
-int __internal_can_own(bool bus_type,
+int __internal_can_own(BusType bus_type,
 					   const uid_t user,
 					   const gid_t group,
 					   const char* const label,
diff --git a/src/internal/internal.h b/src/internal/internal.h
index 51ffec7..7bf2d2d 100755
--- a/src/internal/internal.h
+++ b/src/internal/internal.h
@@ -35,11 +35,16 @@ extern "C" {
 
 #define KDBUS_CONN_MAX_NAMES 256
 
+typedef enum {
+	SYSTEM_BUS = 0,
+	SESSION_BUS = 1
+} BusType;
+
 /** Initializes policies from given policy configuration file name
  * \param[in] bus_type Bus type (system/session)
  * \param[in] config_name Configuration file name
  */
-int __internal_init(bool bus_type, const char* const config_name);
+int __internal_init(BusType bus_type, const char* const config_name);
 
 /** Inits tslog.  */
 void __internal_init_once(void);
@@ -47,7 +52,7 @@ void __internal_init_once(void);
 extern pthread_mutex_t g_mutex;
 
 /** Dumps memory */
-void memory_dump(bool bus_type);
+void memory_dump(BusType bus_type);
 
 /** Flushes logs. */
 void __internal_init_flush_logs(void);
@@ -55,7 +60,7 @@ void __internal_init_flush_logs(void);
 /** Initializes supplementary groups for current process
  * \param[in] bus_type Bus type (system/session)
  */
-void __internal_init_sup_group(bool bus_type, uid_t uid, gid_t gid);
+void __internal_init_sup_group(BusType bus_type, uid_t uid, gid_t gid);
 
 /** Enables logger mutex */
 void __internal_enter(void);
@@ -64,7 +69,7 @@ void __internal_enter(void);
 void __internal_exit(void);
 
 /** checks if user can open dbus bus */
-int __internal_can_open(bool bus_type,
+int __internal_can_open(BusType bus_type,
 						uid_t bus_owner,
 						uid_t user,
 						gid_t group,
@@ -82,7 +87,7 @@ int __internal_can_open(bool bus_type,
  * \param[in] type Message type
  * \return 1 on allow, 0 on deny, negative error code otherwise
  */
-int __internal_can_send(bool bus_type,
+int __internal_can_send(BusType bus_type,
 						const uid_t  user,
 						const gid_t  group,
 						const char* const label,
@@ -104,7 +109,7 @@ int __internal_can_send(bool bus_type,
  * \param[in] type Message type
  * \return 1 on allow, 0 on deny, negative error code otherwise
  */
-int __internal_can_send_multi_dest(bool bus_type,
+int __internal_can_send_multi_dest(BusType bus_type,
 								   const uid_t user,
 								   const gid_t group,
 								   const char* const label,
@@ -126,7 +131,7 @@ int __internal_can_send_multi_dest(bool bus_type,
  * \param[in] type Message type
  * \return 1 on allow, 0 on deny, negative error code otherwise
  */
-int __internal_can_recv(bool bus_type,
+int __internal_can_recv(BusType bus_type,
 						uid_t user,
 						gid_t group,
 						const char* const label,
@@ -148,7 +153,7 @@ int __internal_can_recv(bool bus_type,
  * \param[in] type Message type
  * \return 1 on allow, 0 on deny, negative error code otherwise
  */
-int __internal_can_recv_multi(bool bus_type,
+int __internal_can_recv_multi(BusType bus_type,
 						uid_t user,
 						gid_t group,
 						const char* const label,
@@ -166,7 +171,7 @@ int __internal_can_recv_multi(bool bus_type,
  * \param[in] service Name to own
  * \return 1 on allow, 0 on deny, negative error code otherwise
  */
-int __internal_can_own(bool bus_type,
+int __internal_can_own(BusType bus_type,
 					   uid_t user,
 					   gid_t group,
 					   const char* const label,
diff --git a/src/internal/naive_policy_checker.cpp b/src/internal/naive_policy_checker.cpp
index 6b6dccf..209b482 100755
--- a/src/internal/naive_policy_checker.cpp
+++ b/src/internal/naive_policy_checker.cpp
@@ -40,7 +40,7 @@ DecisionResult NaivePolicyChecker::parseDecision(const DecisionItem& decision,
 	return DecisionResult::DENY;
 }
 
-DecisionItem NaivePolicyChecker::checkItemAccess(bool bus_type, const MatchItemAccess& item)
+DecisionItem NaivePolicyChecker::checkItemAccess(BusType bus_type, const MatchItemAccess& item)
 {
 	const NaivePolicyDb& policy_db = getPolicyDb(bus_type);
 
@@ -54,7 +54,7 @@ DecisionItem NaivePolicyChecker::checkItemAccess(bool bus_type, const MatchItemA
 	return ret;
 }
 
-DecisionResult NaivePolicyChecker::check(bool bus_type,
+DecisionResult NaivePolicyChecker::check(BusType bus_type,
 							   uid_t bus_owner,
 							   uid_t uid,
 							   gid_t gid,
@@ -70,7 +70,7 @@ DecisionResult NaivePolicyChecker::check(bool bus_type,
 }
 
 template <typename T>
-DecisionResult NaivePolicyChecker::check(bool bus_type,
+DecisionResult NaivePolicyChecker::check(BusType bus_type,
 							   uid_t uid,
 							   gid_t gid,
 							   const char* const label,
@@ -78,12 +78,12 @@ DecisionResult NaivePolicyChecker::check(bool bus_type,
 	auto ret = checkItem(bus_type, uid, gid, matchItem);
 	return parseDecision(ret, uid, label);
 }
-template DecisionResult NaivePolicyChecker::check(bool, uid_t, gid_t, const char *, const MatchItemOwn &);
-template DecisionResult NaivePolicyChecker::check(bool, uid_t, gid_t, const char *, const MatchItemSend &);
-template DecisionResult NaivePolicyChecker::check(bool, uid_t, gid_t, const char *, const MatchItemReceive &);
+template DecisionResult NaivePolicyChecker::check(BusType, uid_t, gid_t, const char *, const MatchItemOwn &);
+template DecisionResult NaivePolicyChecker::check(BusType, uid_t, gid_t, const char *, const MatchItemSend &);
+template DecisionResult NaivePolicyChecker::check(BusType, uid_t, gid_t, const char *, const MatchItemReceive &);
 
 template<typename T>
-DecisionItem NaivePolicyChecker::checkItem(bool bus_type, uid_t uid, gid_t gid, const T& item) {
+DecisionItem NaivePolicyChecker::checkItem(BusType bus_type, uid_t uid, gid_t gid, const T& item) {
 	const NaivePolicyDb& policy_db = getPolicyDb(bus_type);
 
 	DecisionItem ret = policy_db.getDecisionItemContextMandatory(item);
@@ -115,17 +115,17 @@ DecisionItem NaivePolicyChecker::checkGroupPolicies(const NaivePolicyDb& policy_
 	return Decision::ANY;
 }
 
-void NaivePolicyChecker::updateGroupDb(bool bus_type, uid_t uid, gid_t gid)
+void NaivePolicyChecker::updateGroupDb(BusType bus_type, uid_t uid, gid_t gid)
 {
 	getPolicyDb(bus_type).initializeGroups(uid, gid);
 }
 
-void NaivePolicyChecker::clearDb(bool bus_type)
+void NaivePolicyChecker::clearDb(BusType bus_type)
 {
 	getPolicyDb(bus_type).clear();
 }
 
-void NaivePolicyChecker::printContent(const bool bus_type)
+void NaivePolicyChecker::printContent(BusType bus_type)
 {
 	getPolicyDb(bus_type).printContent();
 }
diff --git a/src/internal/naive_policy_checker.hpp b/src/internal/naive_policy_checker.hpp
index 5dc5355..ea8898d 100644
--- a/src/internal/naive_policy_checker.hpp
+++ b/src/internal/naive_policy_checker.hpp
@@ -59,7 +59,7 @@ namespace ldp_xml_parser
 		 * \ingroup Implementation
 		 */
 		template<typename T>
-		DecisionItem checkItem(bool bus_type,
+		DecisionItem checkItem(BusType bus_type,
 					   uid_t uid,
 					   gid_t gid,
 					   const T& item);
@@ -70,7 +70,7 @@ namespace ldp_xml_parser
 		 * \return Returns deny=0, allow=1 or cynara error
 		 * \ingroup Implementation
 		 */
-		DecisionItem checkItemAccess(bool bus_type, const MatchItemAccess &item);
+		DecisionItem checkItemAccess(BusType bus_type, const MatchItemAccess &item);
 
 		template<typename T>
 		DecisionItem checkGroupPolicies(const NaivePolicyDb& policy_db,
@@ -88,12 +88,12 @@ namespace ldp_xml_parser
 		/** Clears all db data, useful for reloading configuration
 		 * during testing.
 		 */
-		void clearDb(bool bus_type);
+		void clearDb(BusType bus_type);
 
-		void updateGroupDb(bool bus_type, uid_t uid, gid_t gid);
+		void updateGroupDb(BusType bus_type, uid_t uid, gid_t gid);
 
 		/** Prints to stderr the structures and the amount of their memory */
-		void printContent(const bool bus_type);
+		void printContent(BusType bus_type);
 
 		/** Checks access/open policy for given item
 		 * \param[in] bus_type Bus type (system/session)
@@ -102,7 +102,7 @@ namespace ldp_xml_parser
 		 * \return Returns deny=0, allow=1 or cynara error
 		 * \ingroup Implementation
 		 */
-		DecisionResult check(bool bus_type,
+		DecisionResult check(BusType bus_type,
 				   uid_t bus_owner,
 				   uid_t uid,
 				   gid_t gid,
@@ -118,7 +118,7 @@ namespace ldp_xml_parser
 		 * \ingroup Implementation
 		 */
 		template <typename T>
-		DecisionResult check(bool bus_type,
+		DecisionResult check(BusType bus_type,
 				   uid_t uid,
 				   gid_t gid,
 				   const char* const label,
diff --git a/src/internal/xml_parser.cpp b/src/internal/xml_parser.cpp
index 9be353a..caf98be 100644
--- a/src/internal/xml_parser.cpp
+++ b/src/internal/xml_parser.cpp
@@ -81,7 +81,7 @@ void text_handler(void *data, const char *text, int len) {
 }
 
 bool XmlParser::isMainConfFile(const std::string& filename) {
-	switch ((int)curr_bus) {
+	switch (curr_bus) {
 	case SYSTEM_BUS:
 		return (filename == SYSTEM_BUS_CONF_FILE_PRIMARY || filename == SYSTEM_BUS_CONF_FILE_SECONDARY);
 	case SESSION_BUS:
@@ -177,7 +177,7 @@ void XmlParser::elementEnd(const char *el) {
 	}
 }
 
-int XmlParser::parsePolicy(bool bus, const std::string& fname) {
+int XmlParser::parsePolicy(BusType bus, const std::string& fname) {
 	tslog::log("XmlParser::parsePolicy called with filename: ", fname, "\n");
 	curr_bus = bus;
 	parsePolicyInternal(fname);
diff --git a/src/internal/xml_parser.hpp b/src/internal/xml_parser.hpp
index d309afd..eba16ad 100755
--- a/src/internal/xml_parser.hpp
+++ b/src/internal/xml_parser.hpp
@@ -33,7 +33,7 @@ namespace ldp_xml_parser
 	{
 	public:
 		/** Parses given config file for declared bus type */
-		int parsePolicy(bool bus, const std::string& fname);
+		int parsePolicy(BusType bus_type, const std::string& fname);
 
 		void elementStart(const char *el, const char **attr);
 
@@ -70,7 +70,7 @@ namespace ldp_xml_parser
 
 		bool ignore_always;
 		bool ignore_missing;
-		bool curr_bus;
+		BusType curr_bus;
 		std::string current_text;
 		std::string curr_dir;
 		int ret_code;
diff --git a/src/libdbuspolicy1-private.h b/src/libdbuspolicy1-private.h
index 8fb623c..fc74304 100644
--- a/src/libdbuspolicy1-private.h
+++ b/src/libdbuspolicy1-private.h
@@ -23,9 +23,6 @@
 #include <dbuspolicy1/libdbuspolicy1.h>
 #include <linux/kdbus.h>
 
-#define SYSTEM_BUS   0
-#define SESSION_BUS  1
-
 #define DBUSPOLICY1_EXPORT __attribute__ ((visibility("default")))
 
 typedef uint8_t dbus_name_len;
diff --git a/src/libdbuspolicy1.c b/src/libdbuspolicy1.c
index 3d26e84..8f018ef 100755
--- a/src/libdbuspolicy1.c
+++ b/src/libdbuspolicy1.c
@@ -85,7 +85,7 @@ static int kdbus_open_bus(const char *path)
 	return open(path, O_RDWR|O_NOCTTY|O_LARGEFILE|O_CLOEXEC);
 }
 
-static int kdbus_hello(bool bus_type, uint64_t hello_flags, uint64_t attach_flags_send, uint64_t attach_flags_recv)
+static int kdbus_hello(BusType bus_type, uint64_t hello_flags, uint64_t attach_flags_send, uint64_t attach_flags_recv)
 {
 	struct kdbus_cmd_hello* cmd;
 	struct kdbus_cmd_free cmd_free;
@@ -168,7 +168,7 @@ static bool dbuspolicy_init_once(void)
 	return false;
 }
 
-static int bus_path_resolve(const char *bus_path, char *resolved_path, unsigned resolved_path_size, unsigned int *bus_type, uid_t *bus_owner)
+static int bus_path_resolve(const char *bus_path, char *resolved_path, unsigned resolved_path_size, BusType *bus_type, uid_t *bus_owner)
 {
 	char *p;
 	const char user_suffix[] = "-user/bus";
@@ -222,7 +222,7 @@ static bool init_once[2] = {false, false};
 
 DBUSPOLICY1_EXPORT void* dbuspolicy1_init(const char *bus_path)
 {
-	unsigned int bus_type = -1;
+	BusType bus_type = SESSION_BUS;
 	char resolved_path[PATH_MAX] = { 0 };
 	int rp, rs;
 	uid_t bus_owner = 0;
@@ -235,9 +235,6 @@ DBUSPOLICY1_EXPORT void* dbuspolicy1_init(const char *bus_path)
 		return NULL;
 	}
 
-	if (bus_type)
-		bus_type = SESSION_BUS;
-
 	pthread_mutex_lock(&g_mutex);
 	if (!init_once_done) {
 		init_once_done = true;
@@ -303,7 +300,7 @@ DBUSPOLICY1_EXPORT void __dbuspolicy1_change_creds(void* configuration, uid_t ui
 }
 #endif
 
-static bool configuration_bus_type(struct kconn const *configuration) { return configuration != g_conn; }
+static BusType configuration_bus_type(struct kconn const *configuration) { return configuration == g_conn ? SYSTEM_BUS : SESSION_BUS; }
 
 union kdbus_cmd_union {
 	struct kdbus_cmd_info cmd_info;
@@ -321,7 +318,7 @@ struct kdbus_cmd_param {
 	union kdbus_cmd_union cmd;
 };
 
-int kdbus_get_conn_info(bool bus_type, const char *destination, struct kdbus_cmd_param *info, __u64 flags)
+int kdbus_get_conn_info(BusType bus_type, const char *destination, struct kdbus_cmd_param *info, __u64 flags)
 {
 	char const *label = NULL;
 	const char** k_names = info->k_names;
@@ -420,7 +417,7 @@ DBUSPOLICY1_EXPORT int dbuspolicy1_check_out(void* configuration,
 	(void)requested_reply;
 
 	int r;
-	bool bus_type = configuration_bus_type(configuration);
+	BusType bus_type = configuration_bus_type(configuration);
 	struct kdbus_cmd_param info = {
 		.free_offset = false,
 		.empty_names = true
@@ -513,7 +510,7 @@ DBUSPOLICY1_EXPORT int dbuspolicy1_check_in(void* configuration,
 	(void)requested_reply;
 
 	int r;
-	bool bus_type = configuration_bus_type(configuration);
+	BusType bus_type = configuration_bus_type(configuration);
 	struct kdbus_cmd_param info = {
 		.free_offset = false,
 		.empty_names = true
@@ -554,7 +551,7 @@ end:
 DBUSPOLICY1_EXPORT int dbuspolicy1_can_own(void* configuration, const char* const service)
 {
 	int r;
-	bool bus_type = configuration_bus_type(configuration);
+	BusType bus_type = configuration_bus_type(configuration);
 	__internal_enter();
 	r = __internal_can_own(bus_type, g_udesc.uid, g_udesc.gid, g_udesc.label, service);
 	__internal_exit();
diff --git a/src/test-libdbuspolicy1-access-deny.cpp b/src/test-libdbuspolicy1-access-deny.cpp
index 2dc29c2..5ea0002 100644
--- a/src/test-libdbuspolicy1-access-deny.cpp
+++ b/src/test-libdbuspolicy1-access-deny.cpp
@@ -3,9 +3,6 @@
 #include "internal/internal.h"
 #include <dbuspolicy1/libdbuspolicy1.h>
 
-#define SYSTEM_BUS   0
-#define SESSION_BUS  1
-
 struct AccessTest {
 	bool expected_result;
 	uid_t user;
@@ -73,7 +70,7 @@ void print_test(const struct AccessTest* t, bool result) {
 		   (unsigned long)t->user, (unsigned long)t->group, t->label, (int)t->expected_result, (int)result);
 }
 
-void run_tests_for_bus(bool bus_type, const std::vector<AccessTest>& test_setup, int& i, bool& passed) {
+void run_tests_for_bus(BusType bus_type, const std::vector<AccessTest>& test_setup, int& i, bool& passed) {
 	for (const auto& test : test_setup) {
 		__internal_init_sup_group(bus_type, test.user, test.group);
 		bool res = __internal_can_open(bus_type, bus_owner, test.user, test.group, test.label);
diff --git a/src/test-libdbuspolicy1-method.cpp b/src/test-libdbuspolicy1-method.cpp
index 3c2e16d..d7db435 100644
--- a/src/test-libdbuspolicy1-method.cpp
+++ b/src/test-libdbuspolicy1-method.cpp
@@ -64,13 +64,13 @@ bool method_test() {
 	unsigned  i = 0;
 	bool flag = true;
 	bool ret = true;
-	__internal_init(false, "tests/default_allow/system.conf");
+	__internal_init(SYSTEM_BUS, "tests/default_allow/system.conf");
 	for (i = 0; i < sizeof(method_tests)/sizeof(struct MethodTest); i++) {
 		if (method_tests[i].recv_send == MessageDirection::SEND)
 		{
-			ret = __internal_can_send(false, method_tests[i].user, method_tests[i].group, method_tests[i].label, method_tests[i].name,  method_tests[i].path, method_tests[i].interface, method_tests[i].member, static_cast<int>(method_tests[i].type));
+			ret = __internal_can_send(SYSTEM_BUS, method_tests[i].user, method_tests[i].group, method_tests[i].label, method_tests[i].name,  method_tests[i].path, method_tests[i].interface, method_tests[i].member, static_cast<int>(method_tests[i].type));
 		} else if (method_tests[i].recv_send == MessageDirection::RECEIVE) {
-			ret = __internal_can_recv(false, method_tests[i].user,  method_tests[i].group, method_tests[i].label,  method_tests[i].name, method_tests[i].path, method_tests[i].interface, method_tests[i].member, static_cast<int>(method_tests[i].type));
+			ret = __internal_can_recv(SYSTEM_BUS, method_tests[i].user,  method_tests[i].group, method_tests[i].label,  method_tests[i].name, method_tests[i].path, method_tests[i].interface, method_tests[i].member, static_cast<int>(method_tests[i].type));
 		}
 		if ( (int)((method_tests[i].expected_result)) != ret) {
 			printf("[ERROR][%d] method test failed: %d %d ", i, (int)((method_tests[i].expected_result)), ret);
diff --git a/src/test-libdbuspolicy1-ownership-deny.cpp b/src/test-libdbuspolicy1-ownership-deny.cpp
index 872161e..f52688c 100644
--- a/src/test-libdbuspolicy1-ownership-deny.cpp
+++ b/src/test-libdbuspolicy1-ownership-deny.cpp
@@ -130,9 +130,9 @@ bool ownership_test() {
 	unsigned  i = 0;
 	bool flag = true;
 	bool ret = true;
-	__internal_init(false, "tests/default_deny/system.conf");
+	__internal_init(SYSTEM_BUS, "tests/default_deny/system.conf");
 	for (i = 0; i < sizeof(ownership_tests)/sizeof(struct OwnershipTest); i++) {
-		ret = __internal_can_own(false, ownership_tests[i].user,  ownership_tests[i].group,  ownership_tests[i].label,  ownership_tests[i].service);
+		ret = __internal_can_own(SYSTEM_BUS, ownership_tests[i].user,  ownership_tests[i].group,  ownership_tests[i].label,  ownership_tests[i].service);
 		if ( (int)((ownership_tests[i].expected_result)) != ret) {
 			printf("[ERROR][%d] ownership test failed: %d %d ", i, (int)((ownership_tests[i].expected_result)), ret);
 			ownershipTest_print(&ownership_tests[i], ret);
diff --git a/src/test-libdbuspolicy1-ownership.cpp b/src/test-libdbuspolicy1-ownership.cpp
index ae8d238..5a32425 100644
--- a/src/test-libdbuspolicy1-ownership.cpp
+++ b/src/test-libdbuspolicy1-ownership.cpp
@@ -55,9 +55,9 @@ bool ownership_test() {
 	unsigned  i = 0;
 	bool flag = true;
 	bool ret = true;
-	__internal_init(false, "tests/default_allow/system.conf");
+	__internal_init(SYSTEM_BUS, "tests/default_allow/system.conf");
 	for (i = 0; i < sizeof(ownership_tests)/sizeof(struct OwnershipTest); i++) {
-		ret = __internal_can_own(false, ownership_tests[i].user,  ownership_tests[i].group,  ownership_tests[i].label,  ownership_tests[i].service);
+		ret = __internal_can_own(SYSTEM_BUS, ownership_tests[i].user,  ownership_tests[i].group,  ownership_tests[i].label,  ownership_tests[i].service);
 		if ( (int)((ownership_tests[i].expected_result)) != ret) {
 			printf("[ERROR][%d] ownership test failed: %d %d ", i, (int)((ownership_tests[i].expected_result)), ret);
 			ownershipTest_print(&ownership_tests[i], ret);
diff --git a/src/test-libdbuspolicy1-send_destination_prefix-deny.cpp b/src/test-libdbuspolicy1-send_destination_prefix-deny.cpp
index c2d5a45..2f2fbe5 100644
--- a/src/test-libdbuspolicy1-send_destination_prefix-deny.cpp
+++ b/src/test-libdbuspolicy1-send_destination_prefix-deny.cpp
@@ -137,7 +137,7 @@ bool test()
 	bool flag = true;
 	bool ret = true;
 
-	__internal_init(false, "tests/default_deny/system.conf");
+	__internal_init(SYSTEM_BUS, "tests/default_deny/system.conf");
 
 	for (i = 0; i < sizeof(tests)/sizeof(struct Test); i++) {
 		ret = __internal_can_send(SYSTEM_BUS, tests[i].user,
diff --git a/src/test-libdbuspolicy1-signal.cpp b/src/test-libdbuspolicy1-signal.cpp
index e0c11cc..27069e5 100644
--- a/src/test-libdbuspolicy1-signal.cpp
+++ b/src/test-libdbuspolicy1-signal.cpp
@@ -31,9 +31,9 @@ bool signal_test() {
 	unsigned  i = 0;
 	bool flag = true;
 	bool ret = true;
-	__internal_init(false, "tests/default_allow/system.conf");
+	__internal_init(SYSTEM_BUS, "tests/default_allow/system.conf");
 	for (i = 0; i < sizeof(signal_tests)/sizeof(struct SignalTest); i++) {
-		ret = __internal_can_send(false, signal_tests[i].user, signal_tests[i].group, signal_tests[i].label, signal_tests[i].dest, NULL, signal_tests[i].interface, NULL, DBUSPOLICY_MESSAGE_TYPE_SIGNAL);
+		ret = __internal_can_send(SYSTEM_BUS, signal_tests[i].user, signal_tests[i].group, signal_tests[i].label, signal_tests[i].dest, NULL, signal_tests[i].interface, NULL, DBUSPOLICY_MESSAGE_TYPE_SIGNAL);
 		if ( (int)((signal_tests[i].expected_result)) != ret) {
 			printf("[ERROR][%d] signal test failed: %d %d ", i, (int)((signal_tests[i].expected_result)), ret);
 			signalTest_print(&signal_tests[i], ret);