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/config-parser.c | |
| 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/config-parser.c')
| -rw-r--r-- | bus/config-parser.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/bus/config-parser.c b/bus/config-parser.c index d3f482ab..c42278e1 100644 --- a/bus/config-parser.c +++ b/bus/config-parser.c @@ -231,6 +231,13 @@ merge_included (BusConfigParser *parser, { DBusList *link; + if (!bus_policy_merge (parser->policy, + included->policy)) + { + BUS_SET_OOM (error); + return FALSE; + } + if (included->user != NULL) { dbus_free (parser->user); |