From 1b49e3e3c4f5842be0569f8c38ad9ffff65efc8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 16 Dec 2019 14:16:49 +0100 Subject: [PATCH 1/3] shared/loop-util: rename function As suggested in https://github.com/systemd/systemd/pull/14261#pullrequestreview-332398625. --- src/shared/loop-util.c | 4 ++-- src/shared/loop-util.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shared/loop-util.c b/src/shared/loop-util.c index 6cb45f1f1b..d92ef96162 100644 --- a/src/shared/loop-util.c +++ b/src/shared/loop-util.c @@ -29,7 +29,7 @@ static void cleanup_clear_loop_close(int *fd) { } } -int loop_device_make_full( +int loop_device_make( int fd, int open_flags, uint64_t offset, @@ -166,7 +166,7 @@ int loop_device_make_by_path(const char *path, int open_flags, uint32_t loop_fla if (fd < 0) return -errno; - return loop_device_make_full(fd, open_flags, 0, 0, loop_flags, ret); + return loop_device_make(fd, open_flags, 0, 0, loop_flags, ret); } LoopDevice* loop_device_unref(LoopDevice *d) { diff --git a/src/shared/loop-util.h b/src/shared/loop-util.h index a9c9a647a5..73f82a6d30 100644 --- a/src/shared/loop-util.h +++ b/src/shared/loop-util.h @@ -14,7 +14,7 @@ struct LoopDevice { bool relinquished; }; -int loop_device_make_full(int fd, int open_flags, uint64_t offset, uint64_t size, uint32_t loop_flags, LoopDevice **ret); +int loop_device_make(int fd, int open_flags, uint64_t offset, uint64_t size, uint32_t loop_flags, LoopDevice **ret); int loop_device_make_by_path(const char *path, int open_flags, uint32_t loop_flags, LoopDevice **ret); int loop_device_open(const char *loop_path, int open_flags, LoopDevice **ret); From 4023637a8ab0654c1acd10d684ee13d0f95a18f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 17 Dec 2019 12:32:36 +0100 Subject: [PATCH 2/3] Restore silent handling of BUS_ERROR_SPEED_METER_INACTIVE This only matters for the case where new networkctl is running against older networkd. We should still handle the old error to avoid unnecessary warning about speedmeeter being disabled. This partially reverts commit e813de549b17f2601750c95825d8e0740cbee38c. --- src/libsystemd/sd-bus/bus-common-errors.c | 1 + src/libsystemd/sd-bus/bus-common-errors.h | 1 + src/network/networkctl.c | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libsystemd/sd-bus/bus-common-errors.c b/src/libsystemd/sd-bus/bus-common-errors.c index 9ab3286cc9..4e23edd923 100644 --- a/src/libsystemd/sd-bus/bus-common-errors.c +++ b/src/libsystemd/sd-bus/bus-common-errors.c @@ -102,6 +102,7 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_common_errors[] = { SD_BUS_ERROR_MAP(BUS_ERROR_NO_PRODUCT_UUID, EOPNOTSUPP), + SD_BUS_ERROR_MAP(BUS_ERROR_SPEED_METER_INACTIVE, EOPNOTSUPP), SD_BUS_ERROR_MAP(BUS_ERROR_UNMANAGED_INTERFACE, EOPNOTSUPP), SD_BUS_ERROR_MAP_END diff --git a/src/libsystemd/sd-bus/bus-common-errors.h b/src/libsystemd/sd-bus/bus-common-errors.h index 106bc159a6..8da56551f6 100644 --- a/src/libsystemd/sd-bus/bus-common-errors.h +++ b/src/libsystemd/sd-bus/bus-common-errors.h @@ -81,6 +81,7 @@ #define BUS_ERROR_NO_PRODUCT_UUID "org.freedesktop.hostname1.NoProductUUID" +#define BUS_ERROR_SPEED_METER_INACTIVE "org.freedesktop.network1.SpeedMeterInactive" #define BUS_ERROR_UNMANAGED_INTERFACE "org.freedesktop.network1.UnmanagedInterface" BUS_ERROR_MAP_ELF_USE(bus_common_errors); diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 4197c09186..2f339c8c02 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -352,7 +352,8 @@ static int acquire_link_bitrates(sd_bus *bus, LinkInfo *link) { "org.freedesktop.network1.Link", "BitRates"); if (r < 0) { - bool quiet = sd_bus_error_has_name(&error, SD_BUS_ERROR_UNKNOWN_PROPERTY); + bool quiet = sd_bus_error_has_name(&error, SD_BUS_ERROR_UNKNOWN_PROPERTY) || + sd_bus_error_has_name(&error, BUS_ERROR_SPEED_METER_INACTIVE); return log_full_errno(quiet ? LOG_DEBUG : LOG_WARNING, r, "Failed to query link bit rates: %s", bus_error_message(&error, r)); From b012a1f455cbc82567632bc30a07a238c61a2aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 18 Dec 2019 09:38:25 +0100 Subject: [PATCH 3/3] Make openssl dependency optional again --- src/shared/openssl-util.h | 5 ++++- src/shared/pkcs11-util.h | 9 +++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/shared/openssl-util.h b/src/shared/openssl-util.h index dcb9c9ffa6..a7dab530e4 100644 --- a/src/shared/openssl-util.h +++ b/src/shared/openssl-util.h @@ -1,9 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ #pragma once -#include +#if HAVE_OPENSSL +# include DEFINE_TRIVIAL_CLEANUP_FUNC(X509*, X509_free); DEFINE_TRIVIAL_CLEANUP_FUNC(X509_NAME*, X509_NAME_free); DEFINE_TRIVIAL_CLEANUP_FUNC(EVP_PKEY_CTX*, EVP_PKEY_CTX_free); DEFINE_TRIVIAL_CLEANUP_FUNC(EVP_CIPHER_CTX*, EVP_CIPHER_CTX_free); + +#endif diff --git a/src/shared/pkcs11-util.h b/src/shared/pkcs11-util.h index 42f461d371..46791eb23b 100644 --- a/src/shared/pkcs11-util.h +++ b/src/shared/pkcs11-util.h @@ -4,15 +4,12 @@ #include #if HAVE_P11KIT -#include -#include - -#if HAVE_OPENSSL -#include -#endif +# include +# include #endif #include "macro.h" +#include "openssl-util.h" #include "time-util.h" bool pkcs11_uri_valid(const char *uri);