X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-network%2Fsd-dhcp6-client.c;fp=src%2Flibsystemd-network%2Fsd-dhcp6-client.c;h=cc5b74416ffdb6dcffe02be90f0e63da783318d5;hb=c47e8936a43ce546e8a74fa569e9fbfae6c64be7;hp=8537d7cc86434f004f90ea365a343dc3882c6fe7;hpb=8c67d0a74bc466f0a21d96625ce6b4e24b2a5f1f;p=elogind.git

diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
index 8537d7cc8..cc5b74416 100644
--- a/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/libsystemd-network/sd-dhcp6-client.c
@@ -770,7 +770,10 @@ static int client_parse_message(sd_dhcp6_client *client,
                 }
         }
 
-        if ((r < 0 && r != -ENOMSG) || !clientid) {
+        if (r == -ENOMSG)
+                r = 0;
+
+        if (r < 0 || !clientid) {
                 log_dhcp6_client(client, "%s has incomplete options",
                                  dhcp6_message_type_to_string(message->type));
                 return -EINVAL;