networkd: send dhcp timezone option when UseTimezone is true (#6725)
authorjuga0 <juga@riseup.net>
Wed, 6 Sep 2017 08:10:50 +0000 (08:10 +0000)
committerLennart Poettering <lennart@poettering.net>
Wed, 6 Sep 2017 08:10:50 +0000 (10:10 +0200)
src/network/networkd-dhcp4.c

index 84a25b1..546c90b 100644 (file)
@@ -641,9 +641,11 @@ int dhcp4_configure(Link *link) {
                         return r;
         }
 
-        r = sd_dhcp_client_set_request_option(link->dhcp_client, SD_DHCP_OPTION_NEW_TZDB_TIMEZONE);
-        if (r < 0)
-                return r;
+        if (link->network->dhcp_use_timezone) {
+                r = sd_dhcp_client_set_request_option(link->dhcp_client, SD_DHCP_OPTION_NEW_TZDB_TIMEZONE);
+                if (r < 0)
+                        return r;
+        }
 
         r = dhcp4_set_hostname(link);
         if (r < 0)