projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[daemon-fix] Registering starters: unwanted release_kdbus_name when no error was...
[platform/upstream/dbus.git]
/
bus
/
config-parser.h
diff --git
a/bus/config-parser.h
b/bus/config-parser.h
index
028ec43
..
ba5bf74
100644
(file)
--- a/
bus/config-parser.h
+++ b/
bus/config-parser.h
@@
-1,9
+1,9
@@
-/* -*- mode: C; c-file-style: "gnu" -*- */
+/* -*- mode: C; c-file-style: "gnu"
; indent-tabs-mode: nil;
-*- */
/* config-parser.h XML-library-agnostic configuration file parser
*
* Copyright (C) 2003 Red Hat, Inc.
*
/* config-parser.h XML-library-agnostic configuration file parser
*
* Copyright (C) 2003 Red Hat, Inc.
*
- * Licensed under the Academic Free License version 2.
0
+ * Licensed under the Academic Free License version 2.
1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-17,26
+17,27
@@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 5
9 Temple Place, Suite 330, Boston, MA 02111-1307
USA
+ * Foundation, Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
*
*/
#ifndef BUS_CONFIG_PARSER_H
#define BUS_CONFIG_PARSER_H
*
*/
#ifndef BUS_CONFIG_PARSER_H
#define BUS_CONFIG_PARSER_H
-#include <config.h>
-
#include <dbus/dbus.h>
#include <dbus/dbus-string.h>
#include <dbus/dbus-list.h>
#include <dbus/dbus.h>
#include <dbus/dbus-string.h>
#include <dbus/dbus-list.h>
+#include <dbus/dbus-hash.h>
#include "bus.h"
/* Whatever XML library we're using just pushes data into this API */
typedef struct BusConfigParser BusConfigParser;
#include "bus.h"
/* Whatever XML library we're using just pushes data into this API */
typedef struct BusConfigParser BusConfigParser;
-BusConfigParser* bus_config_parser_new (const DBusString *basedir,
- dbus_bool_t is_toplevel);
+BusConfigParser* bus_config_parser_new (const DBusString *basedir,
+ dbus_bool_t is_toplevel,
+ const BusConfigParser *parent);
+
BusConfigParser* bus_config_parser_ref (BusConfigParser *parser);
void bus_config_parser_unref (BusConfigParser *parser);
dbus_bool_t bus_config_parser_check_doctype (BusConfigParser *parser,
BusConfigParser* bus_config_parser_ref (BusConfigParser *parser);
void bus_config_parser_unref (BusConfigParser *parser);
dbus_bool_t bus_config_parser_check_doctype (BusConfigParser *parser,
@@
-62,18
+63,25
@@
const char* bus_config_parser_get_type (BusConfigParser *parser);
DBusList** bus_config_parser_get_addresses (BusConfigParser *parser);
DBusList** bus_config_parser_get_mechanisms (BusConfigParser *parser);
dbus_bool_t bus_config_parser_get_fork (BusConfigParser *parser);
DBusList** bus_config_parser_get_addresses (BusConfigParser *parser);
DBusList** bus_config_parser_get_mechanisms (BusConfigParser *parser);
dbus_bool_t bus_config_parser_get_fork (BusConfigParser *parser);
+dbus_bool_t bus_config_parser_get_allow_anonymous (BusConfigParser *parser);
+dbus_bool_t bus_config_parser_get_syslog (BusConfigParser *parser);
+dbus_bool_t bus_config_parser_get_keep_umask (BusConfigParser *parser);
const char* bus_config_parser_get_pidfile (BusConfigParser *parser);
const char* bus_config_parser_get_pidfile (BusConfigParser *parser);
+const char* bus_config_parser_get_servicehelper (BusConfigParser *parser);
DBusList** bus_config_parser_get_service_dirs (BusConfigParser *parser);
DBusList** bus_config_parser_get_service_dirs (BusConfigParser *parser);
+DBusList** bus_config_parser_get_conf_dirs (BusConfigParser *parser);
BusPolicy* bus_config_parser_steal_policy (BusConfigParser *parser);
void bus_config_parser_get_limits (BusConfigParser *parser,
BusLimits *limits);
BusPolicy* bus_config_parser_steal_policy (BusConfigParser *parser);
void bus_config_parser_get_limits (BusConfigParser *parser,
BusLimits *limits);
+DBusHashTable* bus_config_parser_steal_service_context_table (BusConfigParser *parser);
+
/* Loader functions (backended off one of the XML parsers). Returns a
* finished ConfigParser.
*/
/* Loader functions (backended off one of the XML parsers). Returns a
* finished ConfigParser.
*/
-BusConfigParser* bus_config_load (const DBusString *file,
- dbus_bool_t is_toplevel,
- DBusError *error);
-
+BusConfigParser* bus_config_load (const DBusString
*file,
+ dbus_bool_t
is_toplevel,
+ const BusConfigParser *parent,
+ DBusError *error);
#endif /* BUS_CONFIG_PARSER_H */
#endif /* BUS_CONFIG_PARSER_H */