Merge branch 'debian/master' into ubuntu/master

1 files changed, 0 insertions, 41 deletions

diff --git a/src/systemd/nm-sd-utils-dhcp.c b/src/systemd/nm-sd-utils-dhcp.c
deleted file mode 100644
index 01be2308..00000000
--- a/src/systemd/nm-sd-utils-dhcp.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
-/*
- * Copyright (C) 2019 Red Hat, Inc.
- */
-
-#include "nm-default.h"
-
-#include "nm-sd-utils-dhcp.h"
-
-#include "sd-adapt-core/nm-sd-adapt-core.h"
-#include "src/libsystemd-network/dhcp-lease-internal.h"
-
-int
-nm_sd_dhcp_lease_get_private_options(sd_dhcp_lease *lease, nm_sd_dhcp_option **out_options)
-{
-    struct sd_dhcp_raw_option *raw_option;
-    int                        cnt = 0;
-
-    g_return_val_if_fail(lease, -EINVAL);
-    g_return_val_if_fail(out_options, -EINVAL);
-    g_return_val_if_fail(*out_options == NULL, -EINVAL);
-
-    if (lease->private_options == NULL)
-        return -ENODATA;
-
-    LIST_FOREACH(options, raw_option, lease->private_options)
-    cnt++;
-
-    *out_options = g_new(nm_sd_dhcp_option, cnt);
-    cnt          = 0;
-
-    LIST_FOREACH(options, raw_option, lease->private_options)
-    {
-        (*out_options)[cnt].code     = raw_option->tag;
-        (*out_options)[cnt].data     = raw_option->data;
-        (*out_options)[cnt].data_len = raw_option->length;
-        cnt++;
-    }
-
-    return cnt;
-}