fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-04 20:00:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

systemd: drop "nm-sd-utils-core.h" and nm_sd_utils_id128_get_machine()

Browse source 
This was only for unit testing, to check whether our reader
for "/etc/machine-id" agrees with systemd's.

That unit test was anyway flawed, because it actually accesses
the machine-id on the test system.

Anyway. Drop this. Most likely our parser is good enough, and
if we get a bug report with a defect, we can unit test against
that.

(cherry picked from commit 747d7dcfe3)
This commit is contained in:
Thomas Haller 2022-04-12 17:37:52 +02:00
parent 1dbcc1c441
commit cd817cdf45
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
5 changed files with 0 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -2329,8 +2329,6 @@ src_libnm_systemd_core_libnm_systemd_core_la_libadd = \
src_libnm_systemd_core_libnm_systemd_core_la_SOURCES = \
src/libnm-systemd-core/nm-default-systemd-core.h \
src/libnm-systemd-core/nm-sd-utils-core.c \
src/libnm-systemd-core/nm-sd-utils-core.h \
src/libnm-systemd-core/nm-sd.c \
src/libnm-systemd-core/nm-sd.h \
src/libnm-systemd-core/nm-sd-utils-dhcp.h \

23
src/core/tests/test-core.c
View file

@ -15,7 +15,6 @@
#include "NetworkManagerUtils.h"
#include "libnm-core-intern/nm-core-internal.h"
#include "nm-core-utils.h"
#include "libnm-systemd-core/nm-sd-utils-core.h"
#include "dns/nm-dns-manager.h"
#include "nm-connectivity.h"
@ -2314,7 +2313,6 @@ test_dns_create_resolv_conf(void)
static void
test_machine_id_read(void)
{
NMUuid machine_id_sd;
const NMUuid *machine_id;
char machine_id_str[33];
gpointer logstate;
@ -2346,27 +2344,6 @@ test_machine_id_read(void)
== machine_id_str);
g_assert(strlen(machine_id_str) == 32);
g_assert_cmpstr(machine_id_str, ==, nm_utils_machine_id_str());
/* double check with systemd's implementation... */
if (!nm_sd_utils_id128_get_machine(&machine_id_sd)) {
/* if systemd failed to read /etc/machine-id, the file likely
* is invalid. Our machine-id is fake, and we have nothing to
* compare against. */
if (g_file_test(LOCALSTATEDIR "/lib/dbus/machine-id", G_FILE_TEST_EXISTS)) {
/* Hm. So systemd failed to read /etc/machine-id, but we may have the one from D-Bus.
* With LOCALSTATEDIR"/lib/dbus/machine-id", we don't really know whether we
* parsed that file. Assume we don't know and skip the test on this system. */
g_assert(!nm_utils_machine_id_is_fake());
return;
}
/* OK, in this case, our function should have generated a random machine ID. */
g_assert(nm_utils_machine_id_is_fake());
} else {
g_assert(!nm_utils_machine_id_is_fake());
g_assert_cmpmem(&machine_id_sd, sizeof(NMUuid), machine_id, 16);
}
}
/*****************************************************************************/

1
src/libnm-systemd-core/meson.build
View file

@ -25,7 +25,6 @@ libnm_systemd_core = static_library(
'src/libsystemd/sd-id128/id128-util.c',
'src/libsystemd/sd-id128/sd-id128.c',
'nm-sd.c',
'nm-sd-utils-core.c',
'nm-sd-utils-dhcp.c',
'sd-adapt-core/nm-sd-adapt-core.c',
),

27
src/libnm-systemd-core/nm-sd-utils-core.c
View file

@ -1,27 +0,0 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
* Copyright (C) 2018 Red Hat, Inc.
*/
#include "libnm-systemd-core/nm-default-systemd-core.h"
#include "nm-sd-utils-core.h"
#include "libnm-glib-aux/nm-uuid.h"
#include "nm-sd-adapt-core.h"
#include "sd-id128.h"
/*****************************************************************************/
NMUuid *
nm_sd_utils_id128_get_machine(NMUuid *out_uuid)
{
g_assert(out_uuid);
G_STATIC_ASSERT_EXPR(sizeof(*out_uuid) == sizeof(sd_id128_t));
if (sd_id128_get_machine((sd_id128_t *) out_uuid) < 0)
return NULL;
return out_uuid;
}

17
src/libnm-systemd-core/nm-sd-utils-core.h
View file

@ -1,17 +0,0 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
* Copyright (C) 2018 Red Hat, Inc.
*/
#ifndef __NM_SD_UTILS_CORE_H__
#define __NM_SD_UTILS_CORE_H__
/*****************************************************************************/
struct _NMUuid;
struct _NMUuid *nm_sd_utils_id128_get_machine(struct _NMUuid *out_uuid);
/*****************************************************************************/
#endif /* __NM_SD_UTILS_CORE_H__ */