From 28028b26b3371756811e95d894f709f4b1207c00 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 18 Dec 2019 18:29:24 +0100 Subject: New upstream version 1.22.0 --- src/tests/test-core.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'src/tests/test-core.c') diff --git a/src/tests/test-core.c b/src/tests/test-core.c index 3eaad104..f55f3dff 100644 --- a/src/tests/test-core.c +++ b/src/tests/test-core.c @@ -1,20 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * * Copyright (C) 2014 Red Hat, Inc. - * */ #include "nm-default.h" @@ -2098,10 +2084,12 @@ test_nm_utils_dhcp_client_id_systemd_node_specific (gconstpointer test_data) gs_unref_bytes GBytes *client_id = NULL; const guint8 *cid; guint32 iaid = d->iaid_ifname; + guint32 tmp; - client_id = nm_utils_dhcp_client_id_systemd_node_specific_full (legacy_unstable_byteorder, - (const guint8 *) d->ifname, - strlen (d->ifname), + tmp = nm_utils_create_dhcp_iaid (legacy_unstable_byteorder, + (const guint8 *) d->ifname, + strlen (d->ifname)); + client_id = nm_utils_dhcp_client_id_systemd_node_specific_full (tmp, (const guint8 *) &d->machine_id, sizeof (d->machine_id)); -- cgit 1.3.0-6-gf8a5