mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-30 06:10:11 +01:00
f92a2bfd1f
According to the documentation, settings from [global-dns] (searches and options) are always merged with those from connections. However this was not happening if no [global-dns-domain-*] exists, in which case connections were ignored. This happened because in the past both global sections must de defined or undefined. When this was changed to allow defining only [global-dns], allowing it in the function that generates the resolv.conf file was forgotten. Fix that now. Anyway, merging these configs doesn't make much sense. The searches and options defined in connections probably make sense only for the nameservers defined in that same connection. Because of this, make the following change: if global nameservers are defined, use searches and options from [global-dns] only, because those defined in connections may not make sense for the global nameservers. If [global-dns] is missing, assume an empty [global-dns] section. Also, if no global nameservers are defined, but [global-dns] is, make that it overwrites the searches and options defined in connections. This is not ideal, but none of the alternatives is better and at least this is easy to remember. So, the resulting rules from above are: - If [global-dns] is defined, it always overwrite searches and options from connections. - If [global-dns-domain-*] is defined, it always overwrite nameservers from connections. It overwrites searches and options too. Fixes:1f0d1d78d2('dns-manager: always apply options from [global-dns]') Fixes:f57a848da5('man: update documentation about global DNS configuration') (cherry picked from commit1cba0a3cca)
318 lines
16 KiB
C
318 lines
16 KiB
C
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
/*
|
|
* Copyright (C) 2014 Red Hat, Inc.
|
|
*/
|
|
|
|
#ifndef NM_CONFIG_DATA_H
|
|
#define NM_CONFIG_DATA_H
|
|
|
|
#include "libnm-platform/nmp-base.h"
|
|
|
|
/*****************************************************************************/
|
|
|
|
typedef enum {
|
|
|
|
/* an invalid mode. */
|
|
NM_AUTH_POLKIT_MODE_UNKNOWN,
|
|
|
|
/* don't use PolicyKit, but only allow root user (uid 0). */
|
|
NM_AUTH_POLKIT_MODE_ROOT_ONLY,
|
|
|
|
/* don't use PolicyKit, but allow all requests. */
|
|
NM_AUTH_POLKIT_MODE_ALLOW_ALL,
|
|
|
|
/* use PolicyKit to authorize requests. Root user (uid 0) always
|
|
* gets a free pass, without consulting PolicyKit. If PolicyKit is not
|
|
* running, authorization will fail for non root users. */
|
|
NM_AUTH_POLKIT_MODE_USE_POLKIT,
|
|
|
|
} NMAuthPolkitMode;
|
|
|
|
/*****************************************************************************/
|
|
|
|
#define NM_TYPE_CONFIG_DATA (nm_config_data_get_type())
|
|
#define NM_CONFIG_DATA(obj) \
|
|
(_NM_G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_CONFIG_DATA, NMConfigData))
|
|
#define NM_CONFIG_DATA_CLASS(klass) \
|
|
(G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_CONFIG_DATA, NMConfigDataClass))
|
|
#define NM_IS_CONFIG_DATA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_CONFIG_DATA))
|
|
#define NM_IS_CONFIG_DATA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_CONFIG_DATA))
|
|
#define NM_CONFIG_DATA_GET_CLASS(obj) \
|
|
(G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_CONFIG_DATA, NMConfigDataClass))
|
|
|
|
#define NM_CONFIG_DATA_CONFIG_MAIN_FILE "config-main-file"
|
|
#define NM_CONFIG_DATA_CONFIG_DESCRIPTION "config-description"
|
|
#define NM_CONFIG_DATA_KEYFILE_USER "keyfile-user"
|
|
#define NM_CONFIG_DATA_KEYFILE_INTERN "keyfile-intern"
|
|
#define NM_CONFIG_DATA_CONNECTIVITY_ENABLED "connectivity-enabled"
|
|
#define NM_CONFIG_DATA_CONNECTIVITY_URI "connectivity-uri"
|
|
#define NM_CONFIG_DATA_CONNECTIVITY_INTERVAL "connectivity-interval"
|
|
#define NM_CONFIG_DATA_CONNECTIVITY_TIMEOUT "connectivity-timeout"
|
|
#define NM_CONFIG_DATA_CONNECTIVITY_RESPONSE "connectivity-response"
|
|
#define NM_CONFIG_DATA_NO_AUTO_DEFAULT "no-auto-default"
|
|
#define NM_CONFIG_DATA_DNS_MODE "dns"
|
|
|
|
typedef enum {
|
|
NM_CONFIG_GET_VALUE_NONE = 0,
|
|
|
|
/* use g_key_file_get_value() instead of g_key_file_get_string(). */
|
|
NM_CONFIG_GET_VALUE_RAW = (1LL << 0),
|
|
|
|
/* strip whitespaces */
|
|
NM_CONFIG_GET_VALUE_STRIP = (1LL << 1),
|
|
|
|
/* if the returned string would be the empty word, return NULL. */
|
|
NM_CONFIG_GET_VALUE_NO_EMPTY = (1LL << 2),
|
|
|
|
/* special flag to read device spec. You want to use this before passing the
|
|
* value to nm_match_spec_split(). */
|
|
NM_CONFIG_GET_VALUE_TYPE_SPEC = NM_CONFIG_GET_VALUE_RAW,
|
|
} NMConfigGetValueFlags;
|
|
|
|
typedef enum {
|
|
NM_CONFIG_CHANGE_NONE = 0,
|
|
|
|
/**************************************************************************
|
|
* The external cause which triggered the reload/configuration-change
|
|
*************************************************************************/
|
|
|
|
NM_CONFIG_CHANGE_CAUSE_SIGHUP = (1L << 0),
|
|
NM_CONFIG_CHANGE_CAUSE_SIGUSR1 = (1L << 1),
|
|
NM_CONFIG_CHANGE_CAUSE_SIGUSR2 = (1L << 2),
|
|
NM_CONFIG_CHANGE_CAUSE_NO_AUTO_DEFAULT = (1L << 3),
|
|
NM_CONFIG_CHANGE_CAUSE_SET_VALUES = (1L << 4),
|
|
NM_CONFIG_CHANGE_CAUSE_CONF = (1L << 5),
|
|
NM_CONFIG_CHANGE_CAUSE_DNS_RC = (1L << 6),
|
|
NM_CONFIG_CHANGE_CAUSE_DNS_FULL = (1L << 7),
|
|
|
|
NM_CONFIG_CHANGE_CAUSES = ((1L << 8) - 1),
|
|
|
|
/**************************************************************************
|
|
* Following flags describe which property of the configuration changed:
|
|
*************************************************************************/
|
|
|
|
/* main-file or config-description changed */
|
|
NM_CONFIG_CHANGE_CONFIG_FILES = (1L << 10),
|
|
|
|
/* any configuration on disk changed */
|
|
NM_CONFIG_CHANGE_VALUES = (1L << 11),
|
|
|
|
/* any user configuration on disk changed (NetworkManager.conf) */
|
|
NM_CONFIG_CHANGE_VALUES_USER = (1L << 12),
|
|
|
|
/* any internal configuration on disk changed (NetworkManager-intern.conf) */
|
|
NM_CONFIG_CHANGE_VALUES_INTERN = (1L << 13),
|
|
|
|
/* configuration regarding connectivity changed */
|
|
NM_CONFIG_CHANGE_CONNECTIVITY = (1L << 14),
|
|
|
|
/* configuration regarding no-auto-default changed */
|
|
NM_CONFIG_CHANGE_NO_AUTO_DEFAULT = (1L << 15),
|
|
|
|
/* configuration regarding dns-mode changed */
|
|
NM_CONFIG_CHANGE_DNS_MODE = (1L << 16),
|
|
|
|
/* configuration regarding rc-manager changed */
|
|
NM_CONFIG_CHANGE_RC_MANAGER = (1L << 17),
|
|
|
|
/* configuration regarding global dns-config changed */
|
|
NM_CONFIG_CHANGE_GLOBAL_DNS_CONFIG = (1L << 18),
|
|
|
|
} NMConfigChangeFlags;
|
|
|
|
typedef enum {
|
|
NM_DNS_RESOLVE_MODE_BACKUP = 0,
|
|
NM_DNS_RESOLVE_MODE_PREFER = 1,
|
|
NM_DNS_RESOLVE_MODE_EXCLUSIVE = 2,
|
|
_NM_NUM_DNS_RESOLVE_MODES = 3
|
|
} NMDnsResolveMode;
|
|
|
|
typedef struct _NMConfigDataClass NMConfigDataClass;
|
|
|
|
typedef struct _NMGlobalDnsConfig NMGlobalDnsConfig;
|
|
typedef struct _NMGlobalDnsDomain NMGlobalDnsDomain;
|
|
|
|
GType nm_config_data_get_type(void);
|
|
|
|
NMConfigData *nm_config_data_new(const char *config_main_file,
|
|
const char *config_description,
|
|
const char *const *no_auto_default,
|
|
GKeyFile *keyfile_user,
|
|
GKeyFile *keyfile_intern);
|
|
NMConfigData *nm_config_data_new_update_keyfile_intern(const NMConfigData *base,
|
|
GKeyFile *keyfile_intern);
|
|
NMConfigData *nm_config_data_new_update_no_auto_default(const NMConfigData *base,
|
|
const char *const *no_auto_default);
|
|
|
|
NMConfigChangeFlags nm_config_data_diff(NMConfigData *old_data, NMConfigData *new_data);
|
|
|
|
void nm_config_data_log(const NMConfigData *self,
|
|
const char *prefix,
|
|
const char *key_prefix,
|
|
const char *no_auto_default_file,
|
|
/* FILE* */ gpointer print_stream);
|
|
|
|
const char *nm_config_data_get_config_main_file(const NMConfigData *config_data);
|
|
const char *nm_config_data_get_config_description(const NMConfigData *config_data);
|
|
|
|
gboolean nm_config_data_has_group(const NMConfigData *self, const char *group);
|
|
gboolean nm_config_data_has_value(const NMConfigData *self,
|
|
const char *group,
|
|
const char *key,
|
|
NMConfigGetValueFlags flags);
|
|
char *nm_config_data_get_value(const NMConfigData *config_data,
|
|
const char *group,
|
|
const char *key,
|
|
NMConfigGetValueFlags flags);
|
|
int nm_config_data_get_value_boolean(const NMConfigData *self,
|
|
const char *group,
|
|
const char *key,
|
|
int default_value);
|
|
gint64 nm_config_data_get_value_int64(const NMConfigData *self,
|
|
const char *group,
|
|
const char *key,
|
|
guint base,
|
|
gint64 min,
|
|
gint64 max,
|
|
gint64 fallback);
|
|
|
|
char **nm_config_data_get_plugins(const NMConfigData *config_data, gboolean allow_default);
|
|
gboolean nm_config_data_get_connectivity_enabled(const NMConfigData *config_data);
|
|
const char *nm_config_data_get_connectivity_uri(const NMConfigData *config_data);
|
|
guint nm_config_data_get_connectivity_interval(const NMConfigData *config_data);
|
|
guint nm_config_data_get_connectivity_timeout(const NMConfigData *config_data);
|
|
const char *nm_config_data_get_connectivity_response(const NMConfigData *config_data);
|
|
|
|
int nm_config_data_get_autoconnect_retries_default(const NMConfigData *config_data);
|
|
|
|
NMAuthPolkitMode nm_config_data_get_main_auth_polkit(const NMConfigData *config_data);
|
|
|
|
const char *const *nm_config_data_get_no_auto_default(const NMConfigData *config_data);
|
|
gboolean nm_config_data_get_no_auto_default_for_device(const NMConfigData *self, NMDevice *device);
|
|
|
|
const char *nm_config_data_get_dns_mode(const NMConfigData *self);
|
|
const char *nm_config_data_get_rc_manager(const NMConfigData *self);
|
|
gboolean nm_config_data_get_systemd_resolved(const NMConfigData *self);
|
|
|
|
gboolean nm_config_data_get_ignore_carrier_for_port(const NMConfigData *self,
|
|
const char *controller,
|
|
const char *port_type);
|
|
|
|
gboolean nm_config_data_get_ignore_carrier_by_device(const NMConfigData *self, NMDevice *device);
|
|
gboolean nm_config_data_get_assume_ipv6ll_only(const NMConfigData *self, NMDevice *device);
|
|
int nm_config_data_get_sriov_num_vfs(const NMConfigData *self, NMDevice *device);
|
|
|
|
NMGlobalDnsConfig *nm_config_data_get_global_dns_config(const NMConfigData *self);
|
|
|
|
const char *nm_config_data_get_iwd_config_path(const NMConfigData *self);
|
|
|
|
extern const char *__start_connection_defaults[];
|
|
extern const char *__stop_connection_defaults[];
|
|
|
|
#define NM_CON_DEFAULT_NOP(name) \
|
|
static const char *NM_UNIQ_T(connection_default, NM_UNIQ) \
|
|
_nm_used _nm_retain _nm_section("connection_defaults") = "" name
|
|
|
|
#define NM_CON_DEFAULT(name) \
|
|
({ \
|
|
static const char *__con_default_prop _nm_used _nm_retain _nm_section( \
|
|
"connection_defaults") = "" name; \
|
|
\
|
|
name; \
|
|
})
|
|
|
|
const char *nm_config_data_get_connection_default(const NMConfigData *self,
|
|
const char *property,
|
|
NMDevice *device);
|
|
|
|
gint64 nm_config_data_get_connection_default_int64(const NMConfigData *self,
|
|
const char *property,
|
|
NMDevice *device,
|
|
gint64 min,
|
|
gint64 max,
|
|
gint64 fallback);
|
|
|
|
struct _NMMatchSpecDeviceData;
|
|
|
|
const char *nm_config_data_get_device_config(const NMConfigData *self,
|
|
const char *property,
|
|
const struct _NMMatchSpecDeviceData *match_data,
|
|
gboolean *has_match);
|
|
|
|
const char *nm_config_data_get_device_config_by_device(const NMConfigData *self,
|
|
const char *property,
|
|
NMDevice *device,
|
|
gboolean *has_match);
|
|
|
|
const char *nm_config_data_get_device_config_by_pllink(const NMConfigData *self,
|
|
const char *property,
|
|
const NMPlatformLink *pllink,
|
|
const char *match_device_type,
|
|
gboolean *has_match);
|
|
|
|
gboolean nm_config_data_get_device_config_boolean_by_device(const NMConfigData *self,
|
|
const char *property,
|
|
NMDevice *device,
|
|
int val_no_match,
|
|
int val_invalid);
|
|
gint64 nm_config_data_get_device_config_int64_by_device(const NMConfigData *self,
|
|
const char *property,
|
|
NMDevice *device,
|
|
int base,
|
|
gint64 min,
|
|
gint64 max,
|
|
gint64 val_no_match,
|
|
gint64 val_invalid);
|
|
|
|
const GSList *nm_config_data_get_device_allowed_connections_specs(const NMConfigData *self,
|
|
NMDevice *device,
|
|
gboolean *has_match);
|
|
|
|
char **nm_config_data_get_groups(const NMConfigData *self);
|
|
char **nm_config_data_get_keys(const NMConfigData *self, const char *group);
|
|
gboolean nm_config_data_is_intern_atomic_group(const NMConfigData *self, const char *group);
|
|
|
|
GKeyFile *nm_config_data_clone_keyfile_intern(const NMConfigData *self);
|
|
|
|
gboolean nm_global_dns_has_global_dns_section(const NMGlobalDnsConfig *dns_config);
|
|
const char *const *nm_global_dns_config_get_searches(const NMGlobalDnsConfig *dns_config);
|
|
const char *const *nm_global_dns_config_get_options(const NMGlobalDnsConfig *dns_config);
|
|
const char *nm_global_dns_config_get_certification_authority(const NMGlobalDnsConfig *dns_config);
|
|
guint nm_global_dns_config_get_resolve_mode(const NMGlobalDnsConfig *dns_config);
|
|
|
|
guint nm_global_dns_config_get_num_domains(const NMGlobalDnsConfig *dns_config);
|
|
NMGlobalDnsDomain *nm_global_dns_config_get_domain(const NMGlobalDnsConfig *dns_config, guint i);
|
|
NMGlobalDnsDomain *nm_global_dns_config_lookup_domain(const NMGlobalDnsConfig *dns_config,
|
|
const char *name);
|
|
const char *nm_global_dns_domain_get_name(const NMGlobalDnsDomain *domain);
|
|
const char *const *nm_global_dns_domain_get_servers(const NMGlobalDnsDomain *domain);
|
|
const char *const *nm_global_dns_domain_get_options(const NMGlobalDnsDomain *domain);
|
|
gboolean nm_global_dns_config_is_internal(const NMGlobalDnsConfig *dns_config);
|
|
gboolean nm_global_dns_config_is_empty(const NMGlobalDnsConfig *dns_config);
|
|
int nm_global_dns_config_cmp(const NMGlobalDnsConfig *a,
|
|
const NMGlobalDnsConfig *b,
|
|
gboolean check_internal);
|
|
void nm_global_dns_config_update_checksum(const NMGlobalDnsConfig *dns_config, GChecksum *sum);
|
|
NMGlobalDnsConfig *nm_global_dns_config_clone(NMGlobalDnsConfig *dns_config);
|
|
void nm_global_dns_config_free(NMGlobalDnsConfig *dns_config);
|
|
|
|
NMGlobalDnsConfig *nm_global_dns_config_from_dbus(const GValue *value, GError **error);
|
|
void nm_global_dns_config_to_dbus(const NMGlobalDnsConfig *dns_config, GValue *value);
|
|
|
|
void nm_config_data_get_warnings(const NMConfigData *self, GPtrArray *warnings);
|
|
|
|
/* private accessors */
|
|
GKeyFile *_nm_config_data_get_keyfile(const NMConfigData *self);
|
|
GKeyFile *_nm_config_data_get_keyfile_user(const NMConfigData *self);
|
|
GKeyFile *_nm_config_data_get_keyfile_intern(const NMConfigData *self);
|
|
|
|
/*****************************************************************************/
|
|
|
|
/* nm-config-data.c requires getting the DHCP manager's configuration. That is a bit
|
|
* ugly, and optimally, NMConfig* is independent of NMDhcpManager. Instead of
|
|
* including the header, forward declare the two functions that we need. */
|
|
struct _NMDhcpManager;
|
|
struct _NMDhcpManager *nm_dhcp_manager_get(void);
|
|
const char *nm_dhcp_manager_get_config(struct _NMDhcpManager *self);
|
|
|
|
#endif /* NM_CONFIG_DATA_H */
|