mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-02-08 08:00:34 +01:00
cdac3e058b
* bus/bus.c (load_config): Break into three separate functions: process_config_first_time_only, process_config_every_time, and process_config_postinit. (process_config_every_time): Move call of bus_registry_set_service_context_table into process_config_postinit. (process_config_postinit): New function, does any processing that needs to happen late in initialization (and also on reload). (bus_context_new): Instead of calling load_config, open config parser here and call process_config_first_time_only and process_config_every_time directly. Later, after we have forked but before changing UID, invoke bus_selinux_full_init, and then call process_config_postinit. (bus_context_reload_config): As in bus_context_new, load parse file inside here, and call process_config_every_time and process_config_postinit. * bus/services.h, bus/services.c (bus_registry_set_service_context_table): Rename from bus_registry_set_sid_table. Take string hash from config parser, and convert them here into SIDs. * bus/config-parser.c (struct BusConfigParser): Have config parser only store a mapping of service->context string. (merge_service_context_hash): New function. (merge_included): Merge context string hashes instead of using bus_selinux_id_table_union. (bus_config_parser_new): Don't use bus_selinux_id_table_new; simply create a new string hash. (bus_config_parser_unref): Unref it. (start_selinux_child): Simply insert strings into hash, don't call bus_selinux_id_table_copy_over. * bus/selinux.h, bus/selinux.c (bus_selinux_id_table_union) (bus_selinux_id_table_copy_over): Delete.
85 lines
4.1 KiB
C
85 lines
4.1 KiB
C
/* -*- mode: C; c-file-style: "gnu" -*- */
|
|
/* config-parser.h XML-library-agnostic configuration file parser
|
|
*
|
|
* Copyright (C) 2003 Red Hat, Inc.
|
|
*
|
|
* 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
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
*/
|
|
|
|
#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-hash.h>
|
|
#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,
|
|
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,
|
|
const char *doctype,
|
|
DBusError *error);
|
|
dbus_bool_t bus_config_parser_start_element (BusConfigParser *parser,
|
|
const char *element_name,
|
|
const char **attribute_names,
|
|
const char **attribute_values,
|
|
DBusError *error);
|
|
dbus_bool_t bus_config_parser_end_element (BusConfigParser *parser,
|
|
const char *element_name,
|
|
DBusError *error);
|
|
dbus_bool_t bus_config_parser_content (BusConfigParser *parser,
|
|
const DBusString *content,
|
|
DBusError *error);
|
|
dbus_bool_t bus_config_parser_finished (BusConfigParser *parser,
|
|
DBusError *error);
|
|
|
|
/* Functions for extracting the parse results */
|
|
const char* bus_config_parser_get_user (BusConfigParser *parser);
|
|
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);
|
|
const char* bus_config_parser_get_pidfile (BusConfigParser *parser);
|
|
DBusList** bus_config_parser_get_service_dirs (BusConfigParser *parser);
|
|
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.
|
|
*/
|
|
BusConfigParser* bus_config_load (const DBusString *file,
|
|
dbus_bool_t is_toplevel,
|
|
const BusConfigParser *parent,
|
|
DBusError *error);
|
|
|
|
|
|
#endif /* BUS_CONFIG_PARSER_H */
|