Skip to content

Commit 5fde060

Browse files
authored
Merge pull request systemd#16235 from yuwata/network-fix-warning-16224
network: fix compile error
2 parents bc694c0 + e6175fb commit 5fde060

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/ubuntu-build-check.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ for args in "${ARGS[@]}"; do
102102
SECONDS=0
103103

104104
info "Checking build with $args"
105-
if ! AR="$AR" CC="$CC" CXX="$CXX" meson -Dtests=unsafe -Dslow-tests=true --werror $args build; then
105+
if ! AR="$AR" CC="$CC" CXX="$CXX" CFLAGS="-Werror" CXXFLAGS="-Werror" meson -Dtests=unsafe -Dslow-tests=true --werror $args build; then
106106
fatal "meson failed with $args"
107107
fi
108108

src/network/networkd-dhcp6.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1065,7 +1065,7 @@ static int dhcp6_assign_delegated_prefix(Link *link,
10651065
address->in_addr.in6 = *prefix;
10661066

10671067
if (!in_addr_is_null(AF_INET6, &link->network->dhcp6_delegation_prefix_token))
1068-
memcpy(&address->in_addr.in6.s6_addr + 8, &link->network->dhcp6_delegation_prefix_token.in6.s6_addr + 8, 8);
1068+
memcpy(address->in_addr.in6.s6_addr + 8, link->network->dhcp6_delegation_prefix_token.in6.s6_addr + 8, 8);
10691069
else {
10701070
r = generate_ipv6_eui_64_address(link, &address->in_addr.in6);
10711071
if (r < 0)

0 commit comments

Comments
 (0)