From 8826fea41716e30987511b7739f9cffab7b814c4 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sat, 17 May 2003 17:53:17 +0000 Subject: 2003-05-17 Havoc Pennington * bus/config-parser.c (merge_included): merge in policies from child configuration file. * bus/policy.c (bus_policy_merge): function to merge two policies together --- bus/policy.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bus/policy.h') diff --git a/bus/policy.h b/bus/policy.h index c9b676e6..940085ee 100644 --- a/bus/policy.h +++ b/bus/policy.h @@ -111,7 +111,8 @@ dbus_bool_t bus_policy_append_user_rule (BusPolicy *policy, dbus_bool_t bus_policy_append_group_rule (BusPolicy *policy, dbus_gid_t gid, BusPolicyRule *rule); - +dbus_bool_t bus_policy_merge (BusPolicy *policy, + BusPolicy *to_absorb); BusClientPolicy* bus_client_policy_new (void); void bus_client_policy_ref (BusClientPolicy *policy); -- cgit