mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-03 12:50:17 +01:00
release: bump version to 1.35.5 (development)
This commit is contained in:
Beniamino Galvani
commit
0047d36fa2
762 changed files with 36375 additions and 46536 deletions
|
|
@ -65,9 +65,9 @@ SpacesInCStyleCastParentheses: false
|
|||
SpacesInContainerLiterals: false
|
||||
SpacesInParentheses: false
|
||||
|
||||
ForEachMacros: ['c_list_for_each',
|
||||
'c_list_for_each_prev',
|
||||
'c_list_for_each_prev_safe',
|
||||
ForEachMacros: [
|
||||
'FOR_EACH_DELAYED_ACTION',
|
||||
'c_list_for_each',
|
||||
'c_list_for_each_continue',
|
||||
'c_list_for_each_entry',
|
||||
'c_list_for_each_entry_continue',
|
||||
|
|
@ -75,6 +75,8 @@ ForEachMacros: ['c_list_for_each',
|
|||
'c_list_for_each_entry_safe',
|
||||
'c_list_for_each_entry_safe_continue',
|
||||
'c_list_for_each_entry_safe_unlink',
|
||||
'c_list_for_each_prev',
|
||||
'c_list_for_each_prev_safe',
|
||||
'c_list_for_each_safe',
|
||||
'c_list_for_each_safe_continue',
|
||||
'c_list_for_each_safe_unlink',
|
||||
|
|
@ -105,12 +107,12 @@ ForEachMacros: ['c_list_for_each',
|
|||
'nm_ip_config_iter_ip_route_for_each',
|
||||
'nm_json_array_foreach',
|
||||
'nm_json_object_foreach',
|
||||
'nm_l3_config_data_iter_ip_address_for_each',
|
||||
'nm_l3_config_data_iter_ip4_address_for_each',
|
||||
'nm_l3_config_data_iter_ip6_address_for_each',
|
||||
'nm_l3_config_data_iter_ip_route_for_each',
|
||||
'nm_l3_config_data_iter_ip4_route_for_each',
|
||||
'nm_l3_config_data_iter_ip6_address_for_each',
|
||||
'nm_l3_config_data_iter_ip6_route_for_each',
|
||||
'nm_l3_config_data_iter_ip_address_for_each',
|
||||
'nm_l3_config_data_iter_ip_route_for_each',
|
||||
'nm_l3_config_data_iter_obj_for_each',
|
||||
'nm_manager_for_each_active_connection',
|
||||
'nm_manager_for_each_active_connection_prev',
|
||||
|
|
|
|||
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -241,7 +241,6 @@ test-*.trs
|
|||
/src/core/NetworkManager-all-sym
|
||||
/src/core/NetworkManager.ver
|
||||
/src/core/devices/bluetooth/tests/nm-bt-test
|
||||
/src/core/devices/tests/test-acd
|
||||
/src/core/devices/tests/test-lldp
|
||||
/src/core/devices/wifi/tests/test-devices-wifi
|
||||
/src/core/devices/wwan/tests/test-service-providers
|
||||
|
|
@ -250,7 +249,6 @@ test-*.trs
|
|||
/src/core/dhcp/tests/test-dhcp-options
|
||||
/src/core/dhcp/tests/test-dhcp-utils
|
||||
/src/core/dnsmasq/tests/test-dnsmasq-utils
|
||||
/src/core/nm-iface-helper
|
||||
/src/core/ndisc/tests/test-ndisc-fake
|
||||
/src/core/ndisc/tests/test-ndisc-linux
|
||||
/src/core/platform/tests/monitor
|
||||
|
|
@ -407,10 +405,12 @@ test-*.trs
|
|||
/src/NetworkManager
|
||||
/src/NetworkManager-all-sym
|
||||
/src/NetworkManager.ver
|
||||
/src/core/devices/tests/test-acd
|
||||
/src/core/initrd/nm-initrd-generator
|
||||
/src/core/initrd/tests/test-cmdline-reader
|
||||
/src/core/initrd/tests/test-dt-reader
|
||||
/src/core/initrd/tests/test-ibft-reader
|
||||
/src/core/nm-iface-helper
|
||||
/src/devices/bluetooth/tests/nm-bt-test
|
||||
/src/devices/tests/test-acd
|
||||
/src/devices/tests/test-arping
|
||||
|
|
|
|||
|
|
@ -47,11 +47,11 @@ variables:
|
|||
#
|
||||
# This is done by running `ci-fairy generate-template` and possibly bump
|
||||
# ".default_tag".
|
||||
FEDORA_TAG: '2021-08-30.0-7ff339b89ca1'
|
||||
UBUNTU_TAG: '2021-08-30.0-432f46c6a3a4'
|
||||
DEBIAN_TAG: '2021-08-30.0-432f46c6a3a4'
|
||||
CENTOS_TAG: '2021-08-30.0-7ff339b89ca1'
|
||||
ALPINE_TAG: '2021-08-30.0-20e22c5d34b7'
|
||||
FEDORA_TAG: '2021-11-09.0-9dd1e1db773a'
|
||||
UBUNTU_TAG: '2021-11-09.0-577176f5eb6c'
|
||||
DEBIAN_TAG: '2021-11-09.0-577176f5eb6c'
|
||||
CENTOS_TAG: '2021-11-09.0-9dd1e1db773a'
|
||||
ALPINE_TAG: '2021-11-09.0-a28badea28eb'
|
||||
|
||||
FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
|
||||
UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh'
|
||||
|
|
@ -680,23 +680,23 @@ t_fedora:34:
|
|||
extends:
|
||||
- .build@template
|
||||
- .fdo.distribution-image@fedora
|
||||
- .nm_artifacts
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '34'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
needs:
|
||||
- "fedora:34@container-prep"
|
||||
when: manual
|
||||
|
||||
t_fedora:35:
|
||||
extends:
|
||||
- .build@template
|
||||
- .fdo.distribution-image@fedora
|
||||
- .nm_artifacts
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '35'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
needs:
|
||||
- "fedora:35@container-prep"
|
||||
when: manual
|
||||
|
||||
t_fedora:36:
|
||||
extends:
|
||||
|
|
@ -926,7 +926,7 @@ t_alpine:latest:
|
|||
|
||||
check-patch:
|
||||
extends:
|
||||
- t_fedora:34
|
||||
- t_fedora:35
|
||||
- .nm_artifacts_undo
|
||||
stage: test
|
||||
script:
|
||||
|
|
@ -935,7 +935,7 @@ check-patch:
|
|||
|
||||
check-tree:
|
||||
extends:
|
||||
- t_fedora:34
|
||||
- t_fedora:35
|
||||
- .nm_artifacts_undo
|
||||
stage: test
|
||||
script:
|
||||
|
|
@ -955,9 +955,9 @@ pages:
|
|||
only:
|
||||
- main
|
||||
dependencies:
|
||||
- t_fedora:34
|
||||
- t_fedora:35
|
||||
needs:
|
||||
- t_fedora:34
|
||||
- t_fedora:35
|
||||
|
||||
triage:issues:
|
||||
stage: triage
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
#
|
||||
|
||||
# We're happy to rebuild all containers when one changes.
|
||||
.default_tag: &default_tag '2021-08-30.0'
|
||||
.default_tag: &default_tag '2021-11-09.0'
|
||||
|
||||
|
||||
# The list of all distributions we want to create job for.
|
||||
|
|
@ -64,4 +64,4 @@ distributions:
|
|||
# specifies which of the above distros is used as source for pages
|
||||
pages_build:
|
||||
name: fedora
|
||||
version: '34'
|
||||
version: '35'
|
||||
|
|
|
|||
|
|
@ -69,8 +69,24 @@ $ git config --add 'blame.ignoreRevsFile' '.git-blame-ignore-revs'
|
|||
|
||||
### Style
|
||||
|
||||
Since our coding style is entirely automated, the following are just
|
||||
some details of the style we use:
|
||||
As we use clang-format, our style is in parts determined by the tool.
|
||||
Run the tool to format the code. See the earlier point.
|
||||
|
||||
The formatting tool cannot cover all questions. The most important rule is
|
||||
to mimic the existing code and *imitate the surrounding style*.
|
||||
|
||||
In general, we require to build without compiler warnings, for the warnings
|
||||
that we enable. Our language is C11 with some GCC-isms (like typeof(),
|
||||
expression statements, cleanup attribute). In practice, we support various versions
|
||||
of GCC and clang. The supported C "dialect", compilers and libc are those that we
|
||||
can practically build and test in our CI. We don't target a theoretical, pure C11/POSIX
|
||||
standard or a libc/compiler that we cannot test.
|
||||
Patches for making NetworkManager more portable are welcome, if there is a
|
||||
practical use and checked by CI. Glibc and musl libc are supported.
|
||||
|
||||
We follow a mixture of [glib's](https://developer.gnome.org/documentation/guidelines/programming/coding-style.html)
|
||||
and [systemd's](https://github.com/systemd/systemd/blob/main/docs/CODING_STYLE.md) style, which already have extensive
|
||||
guidelines. Following there are a few noteworthy points.
|
||||
|
||||
* Use cleanup functions (`gs_free`, `gs_*`, `nm_auto*`) to let a stack
|
||||
variable own a resource instead of explicit free. Combine them with
|
||||
|
|
@ -101,14 +117,8 @@ some details of the style we use:
|
|||
- GOOD: `#define MY_CONSTANT 42`
|
||||
- BAD: `static const unsigned myConstant = 42;`
|
||||
|
||||
Additionally, we require to build without compiler warnings for the warnings
|
||||
that we enable. Also, our language is C11 with some GCC-isms (like typeof(),
|
||||
expression statements, cleanup attribute). In practice, we support various versions
|
||||
of GCC and clang. The supported C "dialect", compilers and libc are those that we
|
||||
can practically build and test in our CI. We don't target a theoretical, pure C11/POSIX
|
||||
standard or a libc/compiler that we cannot test.
|
||||
Patches for making NetworkManager more portable are welcome, if there is a
|
||||
practical use and CI tests. Glibc and musl libc are supported.
|
||||
* Always use curly braces for blocks that span multiple lines. For single lines
|
||||
the braces may be omitted, but are not prohibited.
|
||||
|
||||
### Checkpatch
|
||||
|
||||
|
|
|
|||
78
Makefile.am
78
Makefile.am
|
|
@ -202,7 +202,8 @@ data_edit = sed \
|
|||
-e 's|@NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT[@]|$(NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT)|g' \
|
||||
-e 's|@NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT[@]|$(NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT)|g' \
|
||||
-e 's|@NM_CONFIG_DEFAULT_MAIN_RC_MANAGER[@]|$(NM_CONFIG_DEFAULT_MAIN_RC_MANAGER)|g' \
|
||||
-e 's|@NM_CONFIG_DEFAULT_MAIN_DHCP[@]|$(NM_CONFIG_DEFAULT_MAIN_DHCP)|g'
|
||||
-e 's|@NM_CONFIG_DEFAULT_MAIN_DHCP[@]|$(NM_CONFIG_DEFAULT_MAIN_DHCP)|g' \
|
||||
-e 's|@NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT[@]|$(NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT)|g'
|
||||
|
||||
###############################################################################
|
||||
|
||||
|
|
@ -2074,9 +2075,6 @@ src_core_ldflags = $(CODE_COVERAGE_LDFLAGS)
|
|||
sbin_PROGRAMS += \
|
||||
src/core/NetworkManager
|
||||
|
||||
libexec_PROGRAMS += \
|
||||
src/core/nm-iface-helper
|
||||
|
||||
noinst_LTLIBRARIES += \
|
||||
src/core/libNetworkManagerBase.la \
|
||||
src/core/libNetworkManager.la \
|
||||
|
|
@ -2323,8 +2321,6 @@ src_libnm_systemd_core_libnm_systemd_core_la_SOURCES = \
|
|||
src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-lease.c \
|
||||
src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c \
|
||||
src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-lease.c \
|
||||
src/libnm-systemd-core/src/libsystemd-network/sd-ipv4acd.c \
|
||||
src/libnm-systemd-core/src/libsystemd-network/sd-ipv4ll.c \
|
||||
src/libnm-systemd-core/src/libsystemd-network/sd-lldp-rx.c \
|
||||
src/libnm-systemd-core/src/libsystemd/sd-event/event-source.h \
|
||||
src/libnm-systemd-core/src/libsystemd/sd-event/event-util.c \
|
||||
|
|
@ -2342,8 +2338,6 @@ src_libnm_systemd_core_libnm_systemd_core_la_SOURCES = \
|
|||
src/libnm-systemd-core/src/systemd/sd-dhcp6-option.h \
|
||||
src/libnm-systemd-core/src/systemd/sd-event.h \
|
||||
src/libnm-systemd-core/src/systemd/sd-id128.h \
|
||||
src/libnm-systemd-core/src/systemd/sd-ipv4acd.h \
|
||||
src/libnm-systemd-core/src/systemd/sd-ipv4ll.h \
|
||||
src/libnm-systemd-core/src/systemd/sd-lldp-rx.h \
|
||||
src/libnm-systemd-core/src/systemd/sd-lldp.h \
|
||||
src/libnm-systemd-core/src/systemd/sd-ndisc.h \
|
||||
|
|
@ -2394,10 +2388,6 @@ src_core_libNetworkManagerBase_la_SOURCES = \
|
|||
src/core/nm-l3cfg.h \
|
||||
src/core/nm-ip-config.c \
|
||||
src/core/nm-ip-config.h \
|
||||
src/core/nm-ip4-config.c \
|
||||
src/core/nm-ip4-config.h \
|
||||
src/core/nm-ip6-config.c \
|
||||
src/core/nm-ip6-config.h \
|
||||
\
|
||||
src/core/dhcp/nm-dhcp-client.c \
|
||||
src/core/dhcp/nm-dhcp-client.h \
|
||||
|
|
@ -2436,8 +2426,6 @@ src_core_libNetworkManager_la_SOURCES = \
|
|||
src/core/nm-checkpoint-manager.c \
|
||||
src/core/nm-checkpoint-manager.h \
|
||||
\
|
||||
src/core/devices/nm-acd-manager.c \
|
||||
src/core/devices/nm-acd-manager.h \
|
||||
src/core/devices/nm-lldp-listener.c \
|
||||
src/core/devices/nm-lldp-listener.h \
|
||||
src/core/devices/nm-device-utils.c \
|
||||
|
|
@ -2513,6 +2501,8 @@ src_core_libNetworkManager_la_SOURCES = \
|
|||
src/core/dnsmasq/nm-dnsmasq-utils.c \
|
||||
src/core/dnsmasq/nm-dnsmasq-utils.h \
|
||||
\
|
||||
src/core/ppp/nm-ppp-mgr.c \
|
||||
src/core/ppp/nm-ppp-mgr.h \
|
||||
src/core/ppp/nm-ppp-manager-call.c \
|
||||
src/core/ppp/nm-ppp-manager-call.h \
|
||||
src/core/ppp/nm-ppp-manager.h \
|
||||
|
|
@ -2586,8 +2576,6 @@ src_core_libNetworkManager_la_SOURCES = \
|
|||
src/core/nm-firewall-utils.h \
|
||||
src/core/nm-firewalld-manager.c \
|
||||
src/core/nm-firewalld-manager.h \
|
||||
src/core/nm-proxy-config.c \
|
||||
src/core/nm-proxy-config.h \
|
||||
src/core/nm-auth-manager.c \
|
||||
src/core/nm-auth-manager.h \
|
||||
src/core/nm-auth-utils.c \
|
||||
|
|
@ -2721,44 +2709,6 @@ $(src_core_NetworkManager_OBJECTS): $(src_libnm_core_public_mkenums_h)
|
|||
|
||||
###############################################################################
|
||||
|
||||
src_core_nm_iface_helper_CPPFLAGS = $(src_core_cppflags)
|
||||
|
||||
src_core_nm_iface_helper_SOURCES = \
|
||||
src/core/nm-iface-helper.c
|
||||
|
||||
src_core_nm_iface_helper_LDADD = \
|
||||
src/core/libNetworkManagerBase.la \
|
||||
src/libnm-core-aux-extern/libnm-core-aux-extern.la \
|
||||
src/libnm-core-impl/libnm-core-impl.la \
|
||||
$(libnm_crypto_lib) \
|
||||
src/libnm-core-aux-intern/libnm-core-aux-intern.la \
|
||||
src/libnm-platform/libnm-platform.la \
|
||||
src/libnm-base/libnm-base.la \
|
||||
src/libnm-log-core/libnm-log-core.la \
|
||||
src/libnm-udev-aux/libnm-udev-aux.la \
|
||||
src/libnm-glib-aux/libnm-glib-aux.la \
|
||||
src/libnm-std-aux/libnm-std-aux.la \
|
||||
src/libnm-systemd-core/libnm-systemd-core.la \
|
||||
src/libnm-systemd-shared/libnm-systemd-shared.la \
|
||||
src/n-acd/libn-acd.la \
|
||||
src/n-dhcp4/libn-dhcp4.la \
|
||||
src/c-rbtree/libc-rbtree.la \
|
||||
src/c-siphash/libc-siphash.la \
|
||||
$(SYSTEMD_JOURNAL_LIBS) \
|
||||
$(GLIB_LIBS) \
|
||||
$(LIBUDEV_LIBS) \
|
||||
$(LIBNDP_LIBS) \
|
||||
$(DL_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
src_core_nm_iface_helper_LDFLAGS = \
|
||||
-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
|
||||
$(SANITIZER_EXEC_LDFLAGS)
|
||||
|
||||
$(src_core_nm_iface_helper_OBJECTS): $(src_libnm_core_public_mkenums_h)
|
||||
|
||||
###############################################################################
|
||||
|
||||
noinst_LTLIBRARIES += src/nm-initrd-generator/libnmi-core.la
|
||||
|
||||
src_nm_initrd_generator_libnmi_core_la_CPPFLAGS = \
|
||||
|
|
@ -4275,20 +4225,14 @@ src_core_devices_tests_ldflags = \
|
|||
|
||||
check_programs += \
|
||||
src/core/devices/tests/test-lldp \
|
||||
src/core/devices/tests/test-acd
|
||||
$(NULL)
|
||||
|
||||
src_core_devices_tests_test_lldp_CPPFLAGS = $(src_core_cppflags_test)
|
||||
src_core_devices_tests_test_lldp_LDFLAGS = $(src_core_devices_tests_ldflags)
|
||||
src_core_devices_tests_test_lldp_LDADD = \
|
||||
src/core/libNetworkManagerTest.la
|
||||
|
||||
src_core_devices_tests_test_acd_CPPFLAGS = $(src_core_cppflags_test)
|
||||
src_core_devices_tests_test_acd_LDFLAGS = $(src_core_devices_tests_ldflags)
|
||||
src_core_devices_tests_test_acd_LDADD = \
|
||||
src/core/libNetworkManagerTest.la
|
||||
|
||||
$(src_core_devices_tests_test_lldp_OBJECTS): $(src_libnm_core_public_mkenums_h)
|
||||
$(src_core_devices_tests_test_acd_OBJECTS): $(src_libnm_core_public_mkenums_h)
|
||||
|
||||
EXTRA_DIST += \
|
||||
src/core/devices/tests/meson.build
|
||||
|
|
@ -4391,22 +4335,12 @@ check_programs += \
|
|||
src/core/tests/test-core \
|
||||
src/core/tests/test-core-with-expect \
|
||||
src/core/tests/test-dcb \
|
||||
src/core/tests/test-ip4-config \
|
||||
src/core/tests/test-ip6-config \
|
||||
src/core/tests/test-l3cfg \
|
||||
src/core/tests/test-systemd \
|
||||
src/core/tests/test-utils \
|
||||
src/core/tests/test-wired-defname \
|
||||
$(NULL)
|
||||
|
||||
src_core_tests_test_ip4_config_CPPFLAGS = $(src_core_cppflags_test)
|
||||
src_core_tests_test_ip4_config_LDFLAGS = $(src_core_tests_ldflags)
|
||||
src_core_tests_test_ip4_config_LDADD = $(src_core_tests_ldadd)
|
||||
|
||||
src_core_tests_test_ip6_config_CPPFLAGS = $(src_core_cppflags_test)
|
||||
src_core_tests_test_ip6_config_LDFLAGS = $(src_core_tests_ldflags)
|
||||
src_core_tests_test_ip6_config_LDADD = $(src_core_tests_ldadd)
|
||||
|
||||
src_core_tests_test_dcb_CPPFLAGS = $(src_core_cppflags_test)
|
||||
src_core_tests_test_dcb_LDFLAGS = $(src_core_tests_ldflags)
|
||||
src_core_tests_test_dcb_LDADD = $(src_core_tests_ldadd)
|
||||
|
|
@ -4434,8 +4368,6 @@ src_core_tests_test_l3cfg_LDADD = $(src_core_tests_ldadd)
|
|||
$(src_core_tests_test_core_OBJECTS): $(src_libnm_core_public_mkenums_h)
|
||||
$(src_core_tests_test_core_with_expect_OBJECTS): $(src_libnm_core_public_mkenums_h)
|
||||
$(src_core_tests_test_dcb_OBJECTS): $(src_libnm_core_public_mkenums_h)
|
||||
$(src_core_tests_test_ip4_config_OBJECTS): $(src_libnm_core_public_mkenums_h)
|
||||
$(src_core_tests_test_ip6_config_OBJECTS): $(src_libnm_core_public_mkenums_h)
|
||||
$(src_core_tests_test_l3cfg_OBJECTS): $(src_libnm_core_public_mkenums_h)
|
||||
$(src_core_tests_test_utils_OBJECTS): $(src_libnm_core_public_mkenums_h)
|
||||
$(src_core_tests_test_wired_defname_OBJECTS): $(src_libnm_core_public_mkenums_h)
|
||||
|
|
|
|||
26
NEWS
26
NEWS
|
|
@ -1,15 +1,29 @@
|
|||
=============================================
|
||||
NetworkManager-1.36
|
||||
Overview of changes since NetworkManager-1.34
|
||||
=============================================
|
||||
|
||||
This is a snapshot of NetworkManager development. The API is
|
||||
subject to change and not guaranteed to be compatible with
|
||||
the later release.
|
||||
USE AT YOUR OWN RISK. NOT RECOMMENDED FOR PRODUCTION USE!
|
||||
|
||||
* rework IP configuration code to make it more independent from
|
||||
NMDevice.
|
||||
* Drop "configure-and-quit" mode and nm-iface-helper.
|
||||
|
||||
=============================================
|
||||
NetworkManager-1.34
|
||||
Overview of changes since NetworkManager-1.32
|
||||
=============================================
|
||||
|
||||
* initrd: wait for both IPv4 and IPv6 with "ip=dhcp,dhcp6"
|
||||
* core: better handle sd-resolved errors when resolving hostnames
|
||||
* initrd: wait for both IPv4 and IPv6 with "ip=dhcp,dhcp6".
|
||||
* core: better handle sd-resolved errors when resolving hostnames.
|
||||
* nmcli: fix import WireGuard profile with DNS domain and address
|
||||
family disabled
|
||||
* ndisc: send router solicitations before expiry
|
||||
* policy: send earlier the ip configs to the DNS manager
|
||||
* core: support linking with LLD 13
|
||||
family disabled.
|
||||
* ndisc: send router solicitations before expiry.
|
||||
* policy: send earlier the ip configs to the DNS manager.
|
||||
* core: support linking with LLD 13.
|
||||
* wireguard: importing wg-quick configuration files with nmcli
|
||||
no longer sets a negative, exclusive "dns-priority". This plays
|
||||
better with common split DNS setups that use systemd-resolved.
|
||||
|
|
|
|||
|
|
@ -100,6 +100,9 @@
|
|||
/* Default value for main.rc-manager setting */
|
||||
#mesondefine NM_CONFIG_DEFAULT_MAIN_RC_MANAGER
|
||||
|
||||
/* Default configuration option for wifi.backend */
|
||||
#mesondefine NM_CONFIG_DEFAULT_WIFI_BACKEND
|
||||
|
||||
/* Define the distribution version string */
|
||||
#mesondefine NM_DIST_VERSION
|
||||
|
||||
|
|
|
|||
23
configure.ac
23
configure.ac
|
|
@ -7,8 +7,8 @@ dnl - add corresponding NM_VERSION_x_y_z macros in
|
|||
dnl "shared/nm-version-macros.h.in"
|
||||
dnl - update number in meson.build
|
||||
m4_define([nm_major_version], [1])
|
||||
m4_define([nm_minor_version], [34])
|
||||
m4_define([nm_micro_version], [0])
|
||||
m4_define([nm_minor_version], [35])
|
||||
m4_define([nm_micro_version], [5])
|
||||
m4_define([nm_version],
|
||||
[nm_major_version.nm_minor_version.nm_micro_version])
|
||||
|
||||
|
|
@ -404,6 +404,25 @@ AC_DEFINE_UNQUOTED(NM_CONFIG_DEFAULT_LOGGING_BACKEND, "$nm_config_logging_backen
|
|||
NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT="$nm_config_logging_backend_default"
|
||||
AC_SUBST(NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT)
|
||||
|
||||
AC_ARG_WITH(config-wifi-backend-default,
|
||||
AS_HELP_STRING([--with-config-wifi-backend-default=backend],
|
||||
[Default value for wifi.backend]),
|
||||
nm_config_wifi_backend_default="$withval",
|
||||
nm_config_wifi_backend_default="wpa_supplicant")
|
||||
|
||||
if test "$nm_config_wifi_backend_default" != 'iwd' \
|
||||
-a "$nm_config_wifi_backend_default" != 'wpa_supplicant'; then
|
||||
AC_MSG_ERROR([The default Wi-Fi backend must be either wpa_supplicant or iwd.])
|
||||
fi
|
||||
if test "$nm_config_wifi_backend_default" = "iwd"; then
|
||||
if test "$ac_with_iwd" != "yes"; then
|
||||
AC_MSG_ERROR([Setting the default Wi-Fi backend to iwd requires iwd support.])
|
||||
fi
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED(NM_CONFIG_DEFAULT_WIFI_BACKEND, "$nm_config_wifi_backend_default", [Default configuration option for wifi.backend])
|
||||
NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT="$nm_config_wifi_backend_default"
|
||||
AC_SUBST(NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT)
|
||||
|
||||
# Session tracking support
|
||||
AC_ARG_WITH(systemd-logind,
|
||||
AS_HELP_STRING([--with-systemd-logind=yes|no],
|
||||
|
|
|
|||
|
|
@ -1000,7 +1000,6 @@ fi
|
|||
%ghost %attr(755, root, root) %{_sbindir}/ifdown
|
||||
%{_libexecdir}/nm-dhcp-helper
|
||||
%{_libexecdir}/nm-dispatcher
|
||||
%{_libexecdir}/nm-iface-helper
|
||||
%{_libexecdir}/nm-initrd-generator
|
||||
%{_libexecdir}/nm-daemon-helper
|
||||
%{_libexecdir}/nm-priv-helper
|
||||
|
|
|
|||
|
|
@ -198,6 +198,7 @@ if [[ $NO_DIST != 1 ]]; then
|
|||
--enable-ifcfg-rh \
|
||||
--enable-ifupdown \
|
||||
--with-config-logging-backend-default=syslog \
|
||||
--with-config-wifi-backend-default=wpa_supplicant \
|
||||
--with-libaudit=yes-disabled-by-default \
|
||||
--enable-polkit=yes \
|
||||
--with-nm-cloud-setup=yes \
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ complain ("Don't use API that uses the numeric source id. Instead, use GSource a
|
|||
complain ("Prefer g_snprintf() over snprintf() (for consistency)") if $line =~ /\b(snprintf)\b/;
|
||||
complain ("Avoid g_clear_pointer() and use nm_clear_pointer() (or nm_clear_g_free(), g_clear_object(), etc.)") if $line =~ /\b(g_clear_pointer)\b/;
|
||||
complain ("Define setting properties with _nm_setting_property_define_direct_*() API") if $line =~ /g_param_spec_/ and $filename =~ /\/libnm-core-impl\/nm-setting/;
|
||||
#complain ("Use spaces instead of tabs") if $line =~ /\t/;
|
||||
complain ("Use spaces instead of tabs") if $line =~ /\t/;
|
||||
|
||||
# Further on we process stuff without comments.
|
||||
$_ = $line;
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ def git_merge_base(a, b):
|
|||
|
||||
def git_all_commits_grep(rnge, grep=None):
|
||||
if grep:
|
||||
grep = ["--grep=%s" % (str(grep))]
|
||||
grep = [("--grep=%s" % g) for g in grep]
|
||||
notes = ["-c", "notes.displayref=refs/notes/bugs"]
|
||||
else:
|
||||
grep = []
|
||||
|
|
@ -204,7 +204,7 @@ def git_ref_commit_body_get_cherry_picked_recurse(ref):
|
|||
def git_commits_annotate_fixes(rnge):
|
||||
commits = git_all_commits(rnge)
|
||||
c_dict = _keys_to_dict(commits)
|
||||
for c in git_all_commits_grep(rnge, grep="[Ff]ixes:"):
|
||||
for c in git_all_commits_grep(rnge, grep=["[Ff]ixes:"]):
|
||||
ff = git_ref_commit_body_get_fixes(c)
|
||||
if ff:
|
||||
c_dict[c] = ff
|
||||
|
|
@ -214,7 +214,9 @@ def git_commits_annotate_fixes(rnge):
|
|||
def git_commits_annotate_cherry_picked(rnge):
|
||||
commits = git_all_commits(rnge)
|
||||
c_dict = _keys_to_dict(commits)
|
||||
for c in git_all_commits_grep(ref_head, grep="cherry picked from commit"):
|
||||
for c in git_all_commits_grep(
|
||||
ref_head, grep=["cherry picked from commit", "Ignore-Backport:"]
|
||||
):
|
||||
ff = git_ref_commit_body_get_cherry_picked_recurse(c)
|
||||
if ff:
|
||||
c_dict[c] = ff
|
||||
|
|
|
|||
|
|
@ -10,7 +10,9 @@ die() {
|
|||
DIR="$(realpath "$(dirname "$0")/../../")"
|
||||
cd "$DIR"
|
||||
|
||||
PODNAME=nm-code-format
|
||||
FEDORA_VERSION=35
|
||||
|
||||
PODNAME="nm-code-format-f$FEDORA_VERSION"
|
||||
|
||||
RENEW=0
|
||||
for a; do
|
||||
|
|
@ -37,7 +39,7 @@ if ! podman container exists "$PODNAME" ; then
|
|||
--name="$PODNAME" \
|
||||
-v "$DIR:/tmp/NetworkManager:Z" \
|
||||
-w /tmp/NetworkManager \
|
||||
fedora:34 \
|
||||
"fedora:$FEDORA_VERSION" \
|
||||
/bin/bash -c 'dnf upgrade -y && dnf install -y git /usr/bin/clang-format && ./contrib/scripts/nm-code-format.sh -i'
|
||||
exit 0
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -9,6 +9,17 @@
|
|||
#
|
||||
# This script is also used by [1] to generate the SRPM.
|
||||
# [1] https://copr.fedorainfracloud.org/coprs/networkmanager/NetworkManager-main/package/nm-git-bundle/
|
||||
#
|
||||
# The purpose is the following. We build (many) NetworkManager packages in copr. The
|
||||
# build process runs a script (contrib/scripts/nm-copr-build.sh) that fetches the git
|
||||
# repository (and we cannot just do a shallow copy -- only for the stupid reason
|
||||
# that the automatic version number counts all the commits in the HEAD's history).
|
||||
# NetworkManager's git repository is relatively large so fetching it over and over
|
||||
# is wasteful. The idea is to have a recent git-bundle of the repository, which is
|
||||
# hosted close-by in the copr infrastructure. So the build script first tries to
|
||||
# download the bundle to get the bulk of the git history, before doing additional
|
||||
# fetches from the upstream repository.
|
||||
# From time to time, a new bundle has to be generated in copr.
|
||||
|
||||
set -ex
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ get_nm_git_bundle() {
|
|||
if [ -n "${NM_GIT_BUNDLE+x}" ]; then
|
||||
return 0
|
||||
fi
|
||||
NM_GIT_BUNDLE='https://download.copr.fedorainfracloud.org/results/networkmanager/NetworkManager-main/fedora-34-x86_64/02112667-nm-git-bundle/nm-git-bundle-20210401-202836.noarch.rpm'
|
||||
NM_GIT_BUNDLE='https://download.copr.fedorainfracloud.org/results/networkmanager/NetworkManager-main/fedora-34-x86_64/03130018-nm-git-bundle/nm-git-bundle-20220106-084022.noarch.rpm'
|
||||
fi
|
||||
mkdir nm-git-bundle
|
||||
pushd nm-git-bundle
|
||||
|
|
|
|||
|
|
@ -231,7 +231,6 @@ RUN dnf install -y \\
|
|||
glib2-doc \\
|
||||
gnutls-devel \\
|
||||
gobject-introspection-devel \\
|
||||
grc \\
|
||||
gtk-doc \\
|
||||
intltool \\
|
||||
iproute \\
|
||||
|
|
@ -271,8 +270,8 @@ RUN dnf install -y \\
|
|||
systemd \\
|
||||
systemd-devel \\
|
||||
teamd-devel \\
|
||||
vala \\
|
||||
vala-devel \\
|
||||
vala-tools \\
|
||||
valgrind \\
|
||||
vim \\
|
||||
which
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ char *
|
|||
nm_utils_uuid_generate(void)
|
||||
{
|
||||
uuid_t uuid;
|
||||
char * buf;
|
||||
char *buf;
|
||||
|
||||
buf = g_malloc0(37);
|
||||
uuid_generate_random(uuid);
|
||||
|
|
@ -40,10 +40,10 @@ add_connection(GDBusProxy *proxy, const char *con_name)
|
|||
{
|
||||
GVariantBuilder connection_builder;
|
||||
GVariantBuilder setting_builder;
|
||||
char * uuid;
|
||||
const char * new_con_path;
|
||||
GVariant * ret;
|
||||
GError * error = NULL;
|
||||
char *uuid;
|
||||
const char *new_con_path;
|
||||
GVariant *ret;
|
||||
GError *error = NULL;
|
||||
|
||||
/* Initialize connection GVariantBuilder */
|
||||
g_variant_builder_init(&connection_builder, G_VARIANT_TYPE("a{sa{sv}}"));
|
||||
|
|
@ -117,7 +117,7 @@ int
|
|||
main(int argc, char *argv[])
|
||||
{
|
||||
GDBusProxy *proxy;
|
||||
GError * error = NULL;
|
||||
GError *error = NULL;
|
||||
|
||||
/* Create a D-Bus proxy; NM_DBUS_* defined in nm-dbus-interface.h */
|
||||
proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM,
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@
|
|||
static void
|
||||
added_cb(GObject *client, GAsyncResult *result, gpointer user_data)
|
||||
{
|
||||
GMainLoop * loop = user_data;
|
||||
GMainLoop *loop = user_data;
|
||||
NMRemoteConnection *remote;
|
||||
GError * error = NULL;
|
||||
GError *error = NULL;
|
||||
|
||||
/* NM responded to our request; either handle the resulting error or
|
||||
* print out the object path of the connection we just added.
|
||||
|
|
@ -43,11 +43,11 @@ added_cb(GObject *client, GAsyncResult *result, gpointer user_data)
|
|||
static void
|
||||
add_connection(NMClient *client, GMainLoop *loop, const char *con_name)
|
||||
{
|
||||
NMConnection * connection;
|
||||
NMConnection *connection;
|
||||
NMSettingConnection *s_con;
|
||||
NMSettingWired * s_wired;
|
||||
NMSettingIP4Config * s_ip4;
|
||||
char * uuid;
|
||||
NMSettingWired *s_wired;
|
||||
NMSettingIP4Config *s_ip4;
|
||||
char *uuid;
|
||||
|
||||
/* Create a new connection object */
|
||||
connection = nm_simple_connection_new();
|
||||
|
|
@ -88,9 +88,9 @@ add_connection(NMClient *client, GMainLoop *loop, const char *con_name)
|
|||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
NMClient * client;
|
||||
NMClient *client;
|
||||
GMainLoop *loop;
|
||||
GError * error = NULL;
|
||||
GError *error = NULL;
|
||||
|
||||
loop = g_main_loop_new(NULL, FALSE);
|
||||
|
||||
|
|
|
|||
|
|
@ -25,9 +25,9 @@ static void
|
|||
print_setting(const char *setting_name, GVariant *setting)
|
||||
{
|
||||
GVariantIter iter;
|
||||
const char * property_name;
|
||||
GVariant * value;
|
||||
char * printed_value;
|
||||
const char *property_name;
|
||||
GVariant *value;
|
||||
char *printed_value;
|
||||
|
||||
g_print(" %s:\n", setting_name);
|
||||
g_variant_iter_init(&iter, setting);
|
||||
|
|
@ -43,14 +43,14 @@ print_setting(const char *setting_name, GVariant *setting)
|
|||
static void
|
||||
print_connection(const char *path)
|
||||
{
|
||||
GDBusProxy * proxy;
|
||||
GError * error = NULL;
|
||||
GVariant * ret, *connection = NULL, *s_con = NULL;
|
||||
const char * id, *type;
|
||||
GDBusProxy *proxy;
|
||||
GError *error = NULL;
|
||||
GVariant *ret, *connection = NULL, *s_con = NULL;
|
||||
const char *id, *type;
|
||||
gboolean found;
|
||||
GVariantIter iter;
|
||||
const char * setting_name;
|
||||
GVariant * setting;
|
||||
const char *setting_name;
|
||||
GVariant *setting;
|
||||
|
||||
/* This function asks NetworkManager for the details of the connection */
|
||||
|
||||
|
|
@ -125,9 +125,9 @@ static void
|
|||
get_active_connection_details(const char *obj_path)
|
||||
{
|
||||
GDBusProxy *props_proxy;
|
||||
GVariant * ret = NULL, *path_value = NULL;
|
||||
GVariant *ret = NULL, *path_value = NULL;
|
||||
const char *path = NULL;
|
||||
GError * error = NULL;
|
||||
GError *error = NULL;
|
||||
|
||||
/* This function gets the backing Connection object that describes the
|
||||
* network configuration that the ActiveConnection object is actually using.
|
||||
|
|
@ -185,9 +185,9 @@ out:
|
|||
static void
|
||||
get_active_connections(GDBusProxy *proxy)
|
||||
{
|
||||
GError * error = NULL;
|
||||
GError *error = NULL;
|
||||
GVariant *ret = NULL, *value = NULL;
|
||||
char ** paths;
|
||||
char **paths;
|
||||
int i;
|
||||
|
||||
/* Get the ActiveConnections property from the NM Manager object */
|
||||
|
|
|
|||
|
|
@ -45,6 +45,14 @@ ap_wpa_rsn_flags_to_string(guint32 flags)
|
|||
flags_str[i++] = g_strdup("psk");
|
||||
if (flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)
|
||||
flags_str[i++] = g_strdup("802.1X");
|
||||
if (flags & NM_802_11_AP_SEC_KEY_MGMT_SAE)
|
||||
flags_str[i++] = g_strdup("sae");
|
||||
if (flags & NM_802_11_AP_SEC_KEY_MGMT_OWE)
|
||||
flags_str[i++] = g_strdup("owe");
|
||||
if (flags & NM_802_11_AP_SEC_KEY_MGMT_OWE_TM)
|
||||
flags_str[i++] = g_strdup("owe_transition_mode");
|
||||
if (flags & NM_802_11_AP_SEC_KEY_MGMT_EAP_SUITE_B_192)
|
||||
flags_str[i++] = g_strdup("wpa-eap-suite-b-192");
|
||||
|
||||
if (i == 0)
|
||||
flags_str[i++] = g_strdup("none");
|
||||
|
|
@ -65,11 +73,11 @@ show_access_point_info(NMAccessPoint *ap)
|
|||
{
|
||||
guint32 flags, wpa_flags, rsn_flags, freq, bitrate;
|
||||
guint8 strength;
|
||||
GBytes * ssid;
|
||||
GBytes *ssid;
|
||||
const char *hwaddr;
|
||||
NM80211Mode mode;
|
||||
char * freq_str, *ssid_str, *bitrate_str, *strength_str, *wpa_flags_str, *rsn_flags_str;
|
||||
GString * security_str;
|
||||
char *freq_str, *ssid_str, *bitrate_str, *strength_str, *wpa_flags_str, *rsn_flags_str;
|
||||
GString *security_str;
|
||||
|
||||
/* Get AP properties */
|
||||
flags = nm_access_point_get_flags(ap);
|
||||
|
|
@ -103,11 +111,21 @@ show_access_point_info(NMAccessPoint *ap)
|
|||
g_string_append(security_str, "WEP ");
|
||||
if (wpa_flags != NM_802_11_AP_SEC_NONE)
|
||||
g_string_append(security_str, "WPA ");
|
||||
if (rsn_flags != NM_802_11_AP_SEC_NONE)
|
||||
if ((rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK)
|
||||
|| (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) {
|
||||
g_string_append(security_str, "WPA2 ");
|
||||
}
|
||||
if (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_SAE) {
|
||||
g_string_append(security_str, "WPA3 ");
|
||||
}
|
||||
if ((rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_OWE)
|
||||
|| (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_OWE_TM)) {
|
||||
g_string_append(security_str, "OWE ");
|
||||
}
|
||||
if ((wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)
|
||||
|| (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X))
|
||||
g_string_append(security_str, "Enterprise ");
|
||||
|| (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) {
|
||||
g_string_append(security_str, "802.1X ");
|
||||
}
|
||||
|
||||
if (security_str->len > 0)
|
||||
g_string_truncate(security_str, security_str->len - 1); /* Chop off last space */
|
||||
|
|
@ -138,13 +156,13 @@ show_access_point_info(NMAccessPoint *ap)
|
|||
static void
|
||||
show_wifi_device_info(NMDevice *device)
|
||||
{
|
||||
NMAccessPoint * active_ap = NULL;
|
||||
NMAccessPoint *active_ap = NULL;
|
||||
const GPtrArray *aps;
|
||||
const char * iface;
|
||||
const char * driver;
|
||||
const char *iface;
|
||||
const char *driver;
|
||||
guint32 speed;
|
||||
GBytes * active_ssid;
|
||||
char * active_ssid_str = NULL;
|
||||
GBytes *active_ssid;
|
||||
char *active_ssid_str = NULL;
|
||||
int i;
|
||||
|
||||
/* Get active AP */
|
||||
|
|
@ -185,10 +203,10 @@ show_wifi_device_info(NMDevice *device)
|
|||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
NMClient * client;
|
||||
NMClient *client;
|
||||
const GPtrArray *devices;
|
||||
int i;
|
||||
GError * error = NULL;
|
||||
GError *error = NULL;
|
||||
|
||||
/* Get NMClient object */
|
||||
client = nm_client_new(NULL, &error);
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@ static void
|
|||
list_connections(GDBusProxy *proxy)
|
||||
{
|
||||
int i;
|
||||
GError * error = NULL;
|
||||
GError *error = NULL;
|
||||
GVariant *ret;
|
||||
char ** paths;
|
||||
char **paths;
|
||||
|
||||
/* Call ListConnections D-Bus method */
|
||||
ret = g_dbus_proxy_call_sync(proxy,
|
||||
|
|
|
|||
|
|
@ -24,9 +24,9 @@ show_connection(NMConnection *connection)
|
|||
{
|
||||
NMSettingConnection *s_con;
|
||||
guint64 timestamp;
|
||||
char * timestamp_str;
|
||||
char *timestamp_str;
|
||||
char timestamp_real_str[64];
|
||||
const char * val1, *val2, *val3, *val4, *val5;
|
||||
const char *val1, *val2, *val3, *val4, *val5;
|
||||
|
||||
s_con = nm_connection_get_setting_connection(connection);
|
||||
if (s_con) {
|
||||
|
|
@ -55,8 +55,8 @@ show_connection(NMConnection *connection)
|
|||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
NMClient * client;
|
||||
GError * error = NULL;
|
||||
NMClient *client;
|
||||
GError *error = NULL;
|
||||
const GPtrArray *connections;
|
||||
int i;
|
||||
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@
|
|||
|
||||
static void
|
||||
on_name_appeared(GDBusConnection *connection,
|
||||
const char * name,
|
||||
const char * name_owner,
|
||||
const char *name,
|
||||
const char *name_owner,
|
||||
gpointer user_data)
|
||||
{
|
||||
g_print("Name '%s' on the system bus is owned by %s => NM is running\n", name, name_owner);
|
||||
|
|
@ -35,7 +35,7 @@ int
|
|||
main(int argc, char *argv[])
|
||||
{
|
||||
guint watcher_id;
|
||||
GMainLoop * loop;
|
||||
GMainLoop *loop;
|
||||
GBusNameWatcherFlags flags;
|
||||
|
||||
g_print("Monitor 'org.freedesktop.NetworkManager' D-Bus name\n");
|
||||
|
|
|
|||
|
|
@ -45,9 +45,9 @@ nm_state_to_string(NMState state)
|
|||
|
||||
static void
|
||||
on_signal(GDBusProxy *proxy,
|
||||
char * sender_name,
|
||||
char * signal_name,
|
||||
GVariant * parameters,
|
||||
char *sender_name,
|
||||
char *signal_name,
|
||||
GVariant *parameters,
|
||||
gpointer user_data)
|
||||
{
|
||||
guint32 new_state;
|
||||
|
|
@ -72,10 +72,10 @@ on_signal(GDBusProxy *proxy,
|
|||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
GMainLoop * loop;
|
||||
GError * error = NULL;
|
||||
GMainLoop *loop;
|
||||
GError *error = NULL;
|
||||
GDBusProxyFlags flags;
|
||||
GDBusProxy * proxy;
|
||||
GDBusProxy *proxy;
|
||||
|
||||
/* Monitor 'StateChanged' signal on 'org.freedesktop.NetworkManager' interface */
|
||||
g_print("Monitor NetworkManager's state\n");
|
||||
|
|
|
|||
|
|
@ -17,18 +17,18 @@ static NMConnection *
|
|||
vpn_connection_import(const char *filename)
|
||||
{
|
||||
NMConnection *conn = NULL;
|
||||
GSList * plugins;
|
||||
GSList * iter;
|
||||
GSList *plugins;
|
||||
GSList *iter;
|
||||
|
||||
g_print("Try to import file \"%s\"...\n", filename);
|
||||
|
||||
plugins = nm_vpn_plugin_info_list_load();
|
||||
|
||||
for (iter = plugins; iter; iter = iter->next) {
|
||||
GError * error = NULL;
|
||||
NMVpnPluginInfo * plugin = iter->data;
|
||||
GError *error = NULL;
|
||||
NMVpnPluginInfo *plugin = iter->data;
|
||||
NMVpnEditorPlugin *editor;
|
||||
const char * plugin_name = nm_vpn_plugin_info_get_name(plugin);
|
||||
const char *plugin_name = nm_vpn_plugin_info_get_name(plugin);
|
||||
|
||||
g_print("plugin[%s]: trying import...\n", plugin_name);
|
||||
|
||||
|
|
@ -72,8 +72,8 @@ vpn_connection_import(const char *filename)
|
|||
/*****************************************************************************/
|
||||
|
||||
typedef struct {
|
||||
GMainLoop * loop;
|
||||
GError * error;
|
||||
GMainLoop *loop;
|
||||
GError *error;
|
||||
NMRemoteConnection *rconn;
|
||||
} RequestData;
|
||||
|
||||
|
|
@ -89,8 +89,8 @@ add_cb(GObject *source, GAsyncResult *result, gpointer user_data)
|
|||
static NMRemoteConnection *
|
||||
connection_add(NMConnection *conn)
|
||||
{
|
||||
GError * error = NULL;
|
||||
NMClient * client;
|
||||
GError *error = NULL;
|
||||
NMClient *client;
|
||||
RequestData rdata;
|
||||
|
||||
g_print("Adding connection \"%s\" (%s)\n",
|
||||
|
|
@ -137,8 +137,8 @@ int
|
|||
main(int argc, char **argv)
|
||||
{
|
||||
NMRemoteConnection *rconn;
|
||||
NMConnection * conn;
|
||||
const char * filename;
|
||||
NMConnection *conn;
|
||||
const char *filename;
|
||||
gboolean success;
|
||||
|
||||
if (argc < 2) {
|
||||
|
|
|
|||
|
|
@ -254,22 +254,25 @@ no-auto-default=*
|
|||
<term><varname>configure-and-quit</varname></term>
|
||||
<listitem>
|
||||
<para>
|
||||
When set to '<literal>true</literal>', NetworkManager quits after
|
||||
performing initial network configuration but spawns small helpers
|
||||
to preserve DHCP leases and IPv6 addresses. This is useful in
|
||||
environments where network setup is more or less static or it is
|
||||
desirable to save process time but still handle some dynamic
|
||||
configurations. When this option is <literal>true</literal>,
|
||||
network configuration for Wi-Fi, WWAN, Bluetooth, ADSL, and PPPoE
|
||||
interfaces cannot be preserved due to their use of external
|
||||
services, and these devices will be deconfigured when NetworkManager
|
||||
quits even though other interface's configuration may be preserved.
|
||||
Also, to preserve DHCP addresses the '<literal>dhcp</literal>' option
|
||||
must be set to '<literal>internal</literal>'. The default value of
|
||||
the '<literal>configure-and-quit</literal>' option is
|
||||
'<literal>false</literal>', meaning that NetworkManager will continue
|
||||
running after initial network configuration and continue responding
|
||||
to system and hardware events, D-Bus requests, and user commands.
|
||||
This option is no longer useful to configure in NetworkManager.conf file.
|
||||
It can however also be configured on the command line with the same
|
||||
values, where it has some use.
|
||||
</para>
|
||||
<para>
|
||||
When set to '<literal>initrd</literal>', NetworkManager does not connect
|
||||
to D-Bus and quits after configuring the network. This is an implementation
|
||||
detail how the NetworkManager module of dracut can run NetworkManager.
|
||||
An alternative to this is having NetworkManager as a systemd service
|
||||
with D-Bus in initrd.
|
||||
</para>
|
||||
<para>
|
||||
The value '<literal>true</literal>' is unsupported since version 1.36.
|
||||
Previously this was a mode where NetworkManager would quit after configuring
|
||||
the network and run helper processes for DHCP and SLAAC.
|
||||
</para>
|
||||
<para>
|
||||
Otherwise, NetworkManager runs a system service with D-Bus and does not
|
||||
quit during normal operation.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
|
@ -1234,6 +1237,7 @@ managed=1
|
|||
<para>
|
||||
Specify the Wi-Fi backend used for the device. Currently, supported
|
||||
are <literal>wpa_supplicant</literal> and <literal>iwd</literal> (experimental).
|
||||
If unspecified, the default is "<literal>&NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT;</literal>".
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
|
|
|||
|
|
@ -8,3 +8,4 @@
|
|||
<!ENTITY NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT "@NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@">
|
||||
<!ENTITY NM_CONFIG_DEFAULT_MAIN_RC_MANAGER "@NM_CONFIG_DEFAULT_MAIN_RC_MANAGER@">
|
||||
<!ENTITY NM_CONFIG_DEFAULT_MAIN_DHCP "@NM_CONFIG_DEFAULT_MAIN_DHCP@">
|
||||
<!ENTITY NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT "@NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT@">
|
||||
|
|
|
|||
|
|
@ -74,6 +74,21 @@
|
|||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term>
|
||||
<group choice='plain'>
|
||||
<arg choice='plain'><option>-p</option></arg>
|
||||
<arg choice='plain'><option>--persistent-connections-dir</option></arg>
|
||||
</group>
|
||||
<arg choice='plain'><replaceable>path</replaceable></arg>
|
||||
</term>
|
||||
|
||||
<listitem>
|
||||
<para>Persistent connection directory. If it exists, rd.neednet will not
|
||||
cause a default connection to be generated in absence of other options.</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term>
|
||||
<group choice='plain'>
|
||||
|
|
|
|||
11
meson.build
11
meson.build
|
|
@ -6,7 +6,7 @@ project(
|
|||
# - add corresponding NM_VERSION_x_y_z macros in
|
||||
# "src/libnm-core-public/nm-version-macros.h.in"
|
||||
# - update number in configure.ac
|
||||
version: '1.34.0',
|
||||
version: '1.35.5',
|
||||
license: 'GPL2+',
|
||||
default_options: [
|
||||
'buildtype=debugoptimized',
|
||||
|
|
@ -389,6 +389,14 @@ if config_logging_backend_default == 'default'
|
|||
endif
|
||||
config_h.set_quoted('NM_CONFIG_DEFAULT_LOGGING_BACKEND', config_logging_backend_default)
|
||||
|
||||
config_wifi_backend_default = get_option('config_wifi_backend_default')
|
||||
if config_wifi_backend_default == 'default'
|
||||
config_wifi_backend_default = 'wpa_supplicant'
|
||||
elif config_wifi_backend_default == 'iwd'
|
||||
assert(enable_iwd, 'Setting the default Wi-Fi backend to iwd requires iwd support.')
|
||||
endif
|
||||
config_h.set_quoted('NM_CONFIG_DEFAULT_WIFI_BACKEND', config_wifi_backend_default)
|
||||
|
||||
session_tracking = get_option('session_tracking')
|
||||
session_trackers = []
|
||||
|
||||
|
|
@ -890,6 +898,7 @@ data_conf.set('NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT', config_logging_backend_
|
|||
data_conf.set('NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT', config_auth_polkit_default)
|
||||
data_conf.set('NM_CONFIG_DEFAULT_MAIN_DHCP', config_dhcp_default)
|
||||
data_conf.set('NM_CONFIG_DEFAULT_MAIN_RC_MANAGER', config_dns_rc_manager_default)
|
||||
data_conf.set('NM_CONFIG_DEFAULT_WIFI_BACKEND_TEXT', config_wifi_backend_default)
|
||||
data_conf.set('NM_MAJOR_VERSION', nm_major_version)
|
||||
data_conf.set('NM_MICRO_VERSION', nm_micro_version)
|
||||
data_conf.set('NM_MINOR_VERSION', nm_minor_version)
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ option('polkit_agent_helper_1', type: 'string', value: '', description: 'Path na
|
|||
option('selinux', type: 'boolean', value: true, description: 'Build with SELinux')
|
||||
option('systemd_journal', type: 'boolean', value: true, description: 'Use systemd journal for logging')
|
||||
option('config_logging_backend_default', type: 'combo', choices: ['default', 'syslog', 'journal'], value: 'default', description: 'Default value for logging.backend')
|
||||
option('config_wifi_backend_default', type: 'combo', choices: ['default', 'wpa_supplicant', 'iwd'], value: 'default', description: 'Default value for wifi.backend')
|
||||
option('hostname_persist', type: 'combo', choices: ['default', 'suse', 'gentoo', 'slackware'], value: 'default', description: 'Hostname persist method')
|
||||
option('libaudit', type: 'combo', choices: ['yes', 'yes-disabled-by-default', 'no'], value: 'yes', description: 'Build with audit daemon support. yes-disabled-by-default enables support, but disables it unless explicitly configured via NetworkManager.conf')
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ src/core/dns/nm-dns-manager.c
|
|||
src/core/main-utils.c
|
||||
src/core/main.c
|
||||
src/core/nm-config.c
|
||||
src/core/nm-iface-helper.c
|
||||
src/core/nm-manager.c
|
||||
src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
|
||||
src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
|
||||
|
|
|
|||
2
po/ar.po
2
po/ar.po
|
|
@ -9411,7 +9411,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "خطأ أثناء فتح اتصال VPN '%s'"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/as.po
2
po/as.po
|
|
@ -9859,7 +9859,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "ত্ৰুটি: 'connection show': %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "সক্ৰিয় সংযোগৰ বিৱৰণ"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
|
|
@ -9323,7 +9323,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/bg.po
2
po/bg.po
|
|
@ -9571,7 +9571,7 @@ msgstr "Грешка при „con list“ — %s"
|
|||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
#, fuzzy
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Активни връзки"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
|
|
@ -9888,7 +9888,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "ত্রুটি: 'connection show': %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "সংযোগের বিবরণ সক্রিয় করুন"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/bs.po
2
po/bs.po
|
|
@ -9384,7 +9384,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/ca.po
2
po/ca.po
|
|
@ -10019,7 +10019,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "Error: «connection show»: %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Detalls de l'activació de la connexió"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/cs.po
2
po/cs.po
|
|
@ -9512,7 +9512,7 @@ msgstr "Chyba: „con list“: %s"
|
|||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
#, fuzzy
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Aktivní připojení"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/da.po
2
po/da.po
|
|
@ -9865,7 +9865,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "Fejl: “connection show”: %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Detaljer for aktiv forbindelse"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/de.po
2
po/de.po
|
|
@ -11468,7 +11468,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "Fehler: »connection show«: %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Verbindungsdetails aktivieren"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/dz.po
2
po/dz.po
|
|
@ -9445,7 +9445,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "ཝི་པི་ཨེན་མཐུད་ལམ་'%s'སླར་འདྲེན་འབདཝ་ད་འཛོལ་བ་"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/el.po
2
po/el.po
|
|
@ -9943,7 +9943,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "Σφάλμα: 'εμφάνιση σύνδεσης': %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Ενεργοποίηση λεπτομερειών σύνδεσης"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
|
|
@ -9548,7 +9548,7 @@ msgstr "VPN connection to '%s'"
|
|||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
#, fuzzy
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "No active connections!"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
|
|
@ -9558,7 +9558,7 @@ msgstr "Error: 'con list': %s"
|
|||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
#, fuzzy
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Active connection details"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/eo.po
2
po/eo.po
|
|
@ -9436,7 +9436,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Aktivigi detalojn de konekto"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/es.po
2
po/es.po
|
|
@ -11374,7 +11374,7 @@ msgstr "Error: «connection show»: %s"
|
|||
|
||||
# auto translated by TM merge from project: NetworkManager, version: 0.9.8.2, DocId: NetworkManager
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Activar detalles de conexión"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/et.po
2
po/et.po
|
|
@ -9364,7 +9364,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/eu.po
2
po/eu.po
|
|
@ -9523,7 +9523,7 @@ msgstr "Errorea: konexio ezezaguna: %s."
|
|||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
#, fuzzy
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Konexio aktiboak"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/fi.po
2
po/fi.po
|
|
@ -9509,7 +9509,7 @@ msgstr "Virhe: tuntematon yhteys: %s."
|
|||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
#, fuzzy
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Aktiiviset yhteydet"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/fr.po
2
po/fr.po
|
|
@ -11642,7 +11642,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "Erreur : « connection show » : %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Informations d'activation de connexion"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/gd.po
2
po/gd.po
|
|
@ -9579,7 +9579,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/gl.po
2
po/gl.po
|
|
@ -9619,7 +9619,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "Erro: 'con list': %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Activar detalles da conexión"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/gu.po
2
po/gu.po
|
|
@ -9824,7 +9824,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "ભૂલ: 'જોડાણ બતાવો': %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "જોડાણ વિગતો સક્રિય કરો"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/he.po
2
po/he.po
|
|
@ -9320,7 +9320,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/hi.po
2
po/hi.po
|
|
@ -9840,7 +9840,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "त्रुटि: 'कनेक्शन शो': %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "सक्रिय कनेक्शन विवरण"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/hr.po
2
po/hr.po
|
|
@ -9529,7 +9529,7 @@ msgstr "Greška: 'con list': %s"
|
|||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
#, fuzzy
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Aktivne veze"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/hu.po
2
po/hu.po
|
|
@ -9599,7 +9599,7 @@ msgstr "Hiba: „device show”: %s"
|
|||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
#, fuzzy
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Aktív kapcsolat részletei"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/id.po
2
po/id.po
|
|
@ -11238,7 +11238,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "Galat: 'connection show': %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Aktifkan rincian koneksi"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/it.po
2
po/it.po
|
|
@ -11319,7 +11319,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "Errore: «connection show»: %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Attiva dettagli connessione"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/ja.po
2
po/ja.po
|
|
@ -11231,7 +11231,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "エラー: 'connection show': %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "アクティブな接続の詳細"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/ka.po
2
po/ka.po
|
|
@ -9481,7 +9481,7 @@ msgstr "შეერთებულია VPN-ქსელთან '%s'"
|
|||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
#, fuzzy
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "არავითარი აქტიური შეერთება!"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/kn.po
2
po/kn.po
|
|
@ -9841,7 +9841,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "ದೋಷ: 'connection show': %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "ಸಂಪರ್ಕಗಳ ವಿವರಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸು"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/ko.po
2
po/ko.po
|
|
@ -11036,7 +11036,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "오류: 'connection show': %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "연결 세부 정보 활성화"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/ku.po
2
po/ku.po
|
|
@ -9471,7 +9471,7 @@ msgstr ""
|
|||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
#, fuzzy
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Girêdanên çalak tune!"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/lt.po
2
po/lt.po
|
|
@ -9661,7 +9661,7 @@ msgstr "Klaida: „connection show“: %s"
|
|||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
#, fuzzy
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Aktyvaus ryšio detalės"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/lv.po
2
po/lv.po
|
|
@ -9479,7 +9479,7 @@ msgstr "VPN pieslēgums pie '%s'"
|
|||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
#, fuzzy
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Nav aktīvu sakaru!"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/mk.po
2
po/mk.po
|
|
@ -9327,7 +9327,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/ml.po
2
po/ml.po
|
|
@ -9778,7 +9778,7 @@ msgstr "പിശക്: 'device show': %s"
|
|||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
#, fuzzy
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "സജീവമായ കണക്ഷന് വിശദാംശങ്ങള്"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/mr.po
2
po/mr.po
|
|
@ -9797,7 +9797,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "त्रुटी: 'connection show': %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "जोडणी तपशील सक्रीय करा"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/nb.po
2
po/nb.po
|
|
@ -9339,7 +9339,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/ne.po
2
po/ne.po
|
|
@ -9406,7 +9406,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "भीपीएन जडान पुन: प्राप्ति गर्दा त्रुटि '%s'"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/nl.po
2
po/nl.po
|
|
@ -9377,7 +9377,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/oc.po
2
po/oc.po
|
|
@ -9620,7 +9620,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "Error : « conneccion show » : %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Informacions d'activacion de connexion"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/or.po
2
po/or.po
|
|
@ -9760,7 +9760,7 @@ msgstr "ତ୍ରୁଟି: 'ଉପକରଣ ଦୃଶ୍ୟ': %s"
|
|||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
#, fuzzy
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "ସକ୍ରିୟ ସଂଯୋଗ ବିବରଣୀ"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/pa.po
2
po/pa.po
|
|
@ -9600,7 +9600,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "ਗਲਤੀ: 'device show': %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "ਸਰਗਰਮ ਕਨੈਕਸ਼ਨ ਵੇਰਵੇ"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/pl.po
2
po/pl.po
|
|
@ -10011,7 +10011,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "Błąd: „connection show”: %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Szczegóły aktywowania połączenia"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/pt.po
2
po/pt.po
|
|
@ -9441,7 +9441,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "Erro ao obter a ligação VPN '%s'"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
|
|
@ -11333,7 +11333,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "Erro: “connection show”: %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Ativar detalhes da conexão"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/ru.po
2
po/ru.po
|
|
@ -11590,7 +11590,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "Ошибка «connection show»: %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Сведения об активации соединения"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/rw.po
2
po/rw.po
|
|
@ -9490,7 +9490,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/sk.po
2
po/sk.po
|
|
@ -9471,7 +9471,7 @@ msgstr "VPN spojenie s '%s'"
|
|||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
#, fuzzy
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Bez aktívnych sieťových spojení!"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/sl.po
2
po/sl.po
|
|
@ -9557,7 +9557,7 @@ msgstr "Napaka: 'con list': %s"
|
|||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
#, fuzzy
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Podrobnosti dejavne povezave"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/sq.po
2
po/sq.po
|
|
@ -9380,7 +9380,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/sr.po
2
po/sr.po
|
|
@ -9595,7 +9595,7 @@ msgstr "Грешка: „con list“: %s"
|
|||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
#, fuzzy
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Активне везе"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
|
|
@ -9599,7 +9599,7 @@ msgstr "Greška: „con list“: %s"
|
|||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
#, fuzzy
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Aktivne veze"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/sv.po
2
po/sv.po
|
|
@ -10986,7 +10986,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "Fel: ”connection show”: %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Aktivera anslutningsdetaljer"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/ta.po
2
po/ta.po
|
|
@ -9858,7 +9858,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "பிழை: 'connection show': %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "இணைப்பு விவரங்களை செயல்படுத்து"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/te.po
2
po/te.po
|
|
@ -9796,7 +9796,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "దోషం: 'అనుసంధానం చూపు': %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "క్రియాశీల అనుసంధానము వివరాలు"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/th.po
2
po/th.po
|
|
@ -9482,7 +9482,7 @@ msgstr "เชื่อมต่อ VPN ไปยัง '%s'"
|
|||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
#, fuzzy
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "ไม่มีการเชื่อมต่อที่ใช้งานอยู่!"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/tr.po
2
po/tr.po
|
|
@ -9896,7 +9896,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "Hata: 'bağlantıyı göster': %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Bağlantı ayrıntılarını etkinleştir"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/uk.po
2
po/uk.po
|
|
@ -11643,7 +11643,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "Помилка: «connection show»: %s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "Активувати параметри з'єднання"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/vi.po
2
po/vi.po
|
|
@ -9355,7 +9355,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
2
po/wa.po
2
po/wa.po
|
|
@ -9452,7 +9452,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
4348
po/zh_CN.po
4348
po/zh_CN.po
File diff suppressed because it is too large
Load diff
|
|
@ -9494,7 +9494,7 @@ msgstr "VPN 連線連接到‘%s’"
|
|||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
#, fuzzy
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "沒有使用中的連線"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
|
|
@ -10499,7 +10499,7 @@ msgid "Error: 'connection show': %s"
|
|||
msgstr "錯誤：「connection show」：%s"
|
||||
|
||||
#: ../src/nmcli/connections.c:1497
|
||||
msgid "Activate connection details"
|
||||
msgid "Active connection details"
|
||||
msgstr "啟用連線的詳細資訊"
|
||||
|
||||
#: ../src/nmcli/connections.c:1626 ../src/nmcli/devices.c:1610
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ _get_keys(NMSettingVpn *setting, gboolean is_secrets, guint *out_length)
|
|||
{
|
||||
guint len;
|
||||
const char **keys = NULL;
|
||||
GPtrArray * a;
|
||||
GPtrArray *a;
|
||||
|
||||
nm_assert(NM_IS_SETTING_VPN(setting));
|
||||
|
||||
|
|
|
|||
|
|
@ -33,21 +33,21 @@ typedef enum { /*< skip >*/
|
|||
} NMVpnEditorPluginServiceFlags;
|
||||
|
||||
struct _NMVpnEditorPluginVT {
|
||||
gboolean (*fcn_get_service_info)(NMVpnEditorPlugin * plugin,
|
||||
const char * service_type,
|
||||
char ** out_short_name,
|
||||
char ** out_pretty_name,
|
||||
char ** out_description,
|
||||
gboolean (*fcn_get_service_info)(NMVpnEditorPlugin *plugin,
|
||||
const char *service_type,
|
||||
char **out_short_name,
|
||||
char **out_pretty_name,
|
||||
char **out_description,
|
||||
NMVpnEditorPluginServiceFlags *out_flags);
|
||||
char **(*fcn_get_service_add_details)(NMVpnEditorPlugin *plugin, const char *service_name);
|
||||
gboolean (*fcn_get_service_add_detail)(NMVpnEditorPlugin *plugin,
|
||||
const char * service_type,
|
||||
const char * add_detail,
|
||||
char ** out_pretty_name,
|
||||
char ** out_description,
|
||||
char ** out_add_detail_key,
|
||||
char ** out_add_detail_val,
|
||||
guint * out_flags);
|
||||
const char *service_type,
|
||||
const char *add_detail,
|
||||
char **out_pretty_name,
|
||||
char **out_description,
|
||||
char **out_add_detail_key,
|
||||
char **out_add_detail_val,
|
||||
guint *out_flags);
|
||||
};
|
||||
|
||||
/*****************************************************************************
|
||||
|
|
@ -58,17 +58,17 @@ struct _NMVpnEditorPluginVT {
|
|||
*****************************************************************************/
|
||||
|
||||
static inline gboolean
|
||||
nm_vpn_editor_plugin_get_service_info(NMVpnEditorPlugin * plugin,
|
||||
const char * service_type,
|
||||
char ** out_short_name,
|
||||
char ** out_pretty_name,
|
||||
char ** out_description,
|
||||
nm_vpn_editor_plugin_get_service_info(NMVpnEditorPlugin *plugin,
|
||||
const char *service_type,
|
||||
char **out_short_name,
|
||||
char **out_pretty_name,
|
||||
char **out_description,
|
||||
NMVpnEditorPluginServiceFlags *out_flags)
|
||||
{
|
||||
NMVpnEditorPluginVT vt;
|
||||
gs_free char * short_name_local = NULL;
|
||||
gs_free char * pretty_name_local = NULL;
|
||||
gs_free char * description_local = NULL;
|
||||
gs_free char *short_name_local = NULL;
|
||||
gs_free char *pretty_name_local = NULL;
|
||||
gs_free char *description_local = NULL;
|
||||
guint flags_local = 0;
|
||||
|
||||
g_return_val_if_fail(NM_IS_VPN_EDITOR_PLUGIN(plugin), FALSE);
|
||||
|
|
@ -94,7 +94,7 @@ static inline char **
|
|||
nm_vpn_editor_plugin_get_service_add_details(NMVpnEditorPlugin *plugin, const char *service_name)
|
||||
{
|
||||
NMVpnEditorPluginVT vt;
|
||||
char ** details = NULL;
|
||||
char **details = NULL;
|
||||
|
||||
g_return_val_if_fail(NM_IS_VPN_EDITOR_PLUGIN(plugin), NULL);
|
||||
g_return_val_if_fail(service_name, NULL);
|
||||
|
|
@ -109,19 +109,19 @@ nm_vpn_editor_plugin_get_service_add_details(NMVpnEditorPlugin *plugin, const ch
|
|||
|
||||
static inline gboolean
|
||||
nm_vpn_editor_plugin_get_service_add_detail(NMVpnEditorPlugin *plugin,
|
||||
const char * service_type,
|
||||
const char * add_detail,
|
||||
char ** out_pretty_name,
|
||||
char ** out_description,
|
||||
char ** out_add_detail_key,
|
||||
char ** out_add_detail_val,
|
||||
guint * out_flags)
|
||||
const char *service_type,
|
||||
const char *add_detail,
|
||||
char **out_pretty_name,
|
||||
char **out_description,
|
||||
char **out_add_detail_key,
|
||||
char **out_add_detail_val,
|
||||
guint *out_flags)
|
||||
{
|
||||
NMVpnEditorPluginVT vt;
|
||||
gs_free char * pretty_name_local = NULL;
|
||||
gs_free char * description_local = NULL;
|
||||
gs_free char * add_detail_key_local = NULL;
|
||||
gs_free char * add_detail_val_local = NULL;
|
||||
gs_free char *pretty_name_local = NULL;
|
||||
gs_free char *description_local = NULL;
|
||||
gs_free char *add_detail_key_local = NULL;
|
||||
gs_free char *add_detail_val_local = NULL;
|
||||
guint flags_local = 0;
|
||||
|
||||
g_return_val_if_fail(NM_IS_VPN_EDITOR_PLUGIN(plugin), FALSE);
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue