From 926fc8ee6360980682ffb50d2e3dcbe961316b74 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 1 Dec 2021 14:48:51 +0900
Subject: [PATCH] network: dhcp6: make UplinkInterface=:self take effect only
 when DHCPv6PrefixDelegation= is enabled

---
 man/systemd.network.xml      | 11 ++++++-----
 src/network/networkd-dhcp6.c |  3 +++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index fb2569a9dd8..1457b3e6915 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -2106,11 +2106,12 @@ Table=1234</programlisting></para>
           <listitem>
             <para>Allows DHCPv6 client to start without router advertisements's managed or other
             address configuration flag. Takes one of <literal>no</literal>, <literal>solicit</literal>
-            or <literal>information-request</literal>. When this is not specified and
-            <varname>UplinkInterface=:self</varname> is specified, then <literal>solicit</literal> is
-            implied. Otherwise, defaults to <literal>no</literal>, and the DHCPv6 client will be
-            started when an RA is received. See also <varname>DHCPv6Client=</varname> setting in the
-            [IPv6AcceptRA] section.</para>
+            or <literal>information-request</literal>. If this is not specified,
+            <literal>solicit</literal> is used when <varname>DHCPv6PrefixDelegation=</varname> is
+            enabled and <varname>UplinkInterface=:self</varname> is specified in the
+            [DHCPv6PrefixDelegation] section. Otherwise, defaults to <literal>no</literal>, and the
+            DHCPv6 client will be started when an RA is received. See also
+            <varname>DHCPv6Client=</varname> setting in the [IPv6AcceptRA] section.</para>
           </listitem>
         </varlistentry>
       </variablelist>
diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
index da5a22a7b56..5c9c2116629 100644
--- a/src/network/networkd-dhcp6.c
+++ b/src/network/networkd-dhcp6.c
@@ -70,6 +70,9 @@ static DHCP6ClientStartMode link_get_dhcp6_client_start_mode(Link *link) {
         if (link->network->dhcp6_client_start_mode >= 0)
                 return link->network->dhcp6_client_start_mode;
 
+        if (!link_dhcp6_pd_is_enabled(link))
+                return DHCP6_CLIENT_START_MODE_NO;
+
         if (dhcp6_pd_resolve_uplink(link, &uplink) < 0)
                 return DHCP6_CLIENT_START_MODE_NO;
 
-- 
2.47.3