From 893d859ed4ab785f46485fad28779f026fa166a1 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 28 Apr 2003 19:29:42 +0000 Subject: 2003-04-28 Havoc Pennington * configure.in: 0.10 * NEWS: update * bus/system.conf.in: add system.d * dbus/dbus-userdb.c (_dbus_user_database_lookup): fix bug when username was provided but not uid * bus/config-parser.c (struct BusConfigParser): keep track of whether the parser is toplevel or was included; change some of the error handling if it's included. --- bus/config-parser.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'bus/config-parser.h') diff --git a/bus/config-parser.h b/bus/config-parser.h index acf868ef..eaeafdc5 100644 --- a/bus/config-parser.h +++ b/bus/config-parser.h @@ -35,7 +35,8 @@ typedef struct BusConfigParser BusConfigParser; -BusConfigParser* bus_config_parser_new (const DBusString *basedir); +BusConfigParser* bus_config_parser_new (const DBusString *basedir, + dbus_bool_t is_toplevel); void bus_config_parser_ref (BusConfigParser *parser); void bus_config_parser_unref (BusConfigParser *parser); dbus_bool_t bus_config_parser_check_doctype (BusConfigParser *parser, @@ -71,6 +72,7 @@ void bus_config_parser_get_limits (BusConfigParser *parser, * finished ConfigParser. */ BusConfigParser* bus_config_load (const DBusString *file, + dbus_bool_t is_toplevel, DBusError *error); -- cgit