diff options
author | Havoc Pennington <hp@redhat.com> | 2003-05-17 17:53:17 +0000 |
---|---|---|
committer | Havoc Pennington <hp@redhat.com> | 2003-05-17 17:53:17 +0000 |
commit | 8826fea41716e30987511b7739f9cffab7b814c4 (patch) | |
tree | e95c881807a59b3f355384ce83cd5e8cef2a7c54 /bus/policy.h | |
parent | 306eab3e3d998472ad111146a12b7697ea96c9b9 (diff) |
2003-05-17 Havoc Pennington <hp@pobox.com>
* 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
Diffstat (limited to 'bus/policy.h')
-rw-r--r-- | bus/policy.h | 3 |
1 files changed, 2 insertions, 1 deletions
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); |