diff options
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); |