colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: branch 'main'

Browse Source 
libnm-systemd-core: Disable sd_dhcp6_client_set_duid_uuid function

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1966
This commit is contained in:
Íñigo Huguet
2024-08-02 06:16:17 +00:00
parent 9a891f5e3c 118e3117fe
commit 331c9ccf92
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-duid.c
View File

@@ -193,6 +193,7 @@ int sd_dhcp_duid_set_en(sd_dhcp_duid *duid) {
return 0; return 0;
} }
#if 0 /* NM_IGNORED */
int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) { int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) {
sd_id128_t machine_id; sd_id128_t machine_id;
int r; int r;
@@ -209,6 +210,7 @@ int sd_dhcp_duid_set_uuid(sd_dhcp_duid *duid) {
duid->size = offsetof(struct duid, uuid.uuid) + sizeof(machine_id); duid->size = offsetof(struct duid, uuid.uuid) + sizeof(machine_id);
return 0; return 0;
} }
#endif /* NM_IGNORED */
int dhcp_duid_to_string_internal(uint16_t type, const void *data, size_t data_size, char **ret) { int dhcp_duid_to_string_internal(uint16_t type, const void *data, size_t data_size, char **ret) {
_cleanup_free_ char *p = NULL, *x = NULL; _cleanup_free_ char *p = NULL, *x = NULL;

2
src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c
View File

@@ -244,6 +244,7 @@ int sd_dhcp6_client_set_duid_en(sd_dhcp6_client *client) {
return 0; return 0;
} }
#if 0 /* NM_IGNORED */
int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) { int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) {
int r; int r;
@@ -256,6 +257,7 @@ int sd_dhcp6_client_set_duid_uuid(sd_dhcp6_client *client) {
return 0; return 0;
} }
#endif /* NM_IGNORED */
int sd_dhcp6_client_set_duid_raw(sd_dhcp6_client *client, uint16_t duid_type, const uint8_t *duid, size_t duid_len) { int sd_dhcp6_client_set_duid_raw(sd_dhcp6_client *client, uint16_t duid_type, const uint8_t *duid, size_t duid_len) {
int r; int r;