From 8eb9058dc1f99a5eb9b8726a978fcc0720837a10 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 26 Aug 2015 19:19:32 +0200
Subject: dhcp,network: implement RFC 4833 (DHCP Timezone option)

This one is simply to add: encode the tzdata timezone in the DHCP
options and optionally make use of it.
---
 src/network/networkd-network.c | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

(limited to 'src/network/networkd-network.c')

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 8f773e738d..3619e3160c 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -124,7 +124,8 @@ static int network_load_one(Manager *manager, const char *filename) {
                          "Address\0"
                          "Route\0"
                          "DHCP\0"
-                         "DHCPv4\0"
+                         "DHCPv4\0" /* compat */
+                         "DHCPServer\0"
                          "Bridge\0"
                          "BridgeFDB\0",
                          config_item_perf_lookup, network_network_gperf_lookup,
@@ -258,6 +259,8 @@ void network_free(Network *network) {
         condition_free_list(network->match_kernel);
         condition_free_list(network->match_arch);
 
+        free(network->dhcp_server_timezone);
+
         free(network);
 }
 
@@ -849,3 +852,38 @@ int config_parse_hostname(
         *hostname = hostname_cleanup(hn);
         return 0;
 }
+
+int config_parse_timezone(
+                const char *unit,
+                const char *filename,
+                unsigned line,
+                const char *section,
+                unsigned section_line,
+                const char *lvalue,
+                int ltype,
+                const char *rvalue,
+                void *data,
+                void *userdata) {
+
+        char **timezone = data, *tz = NULL;
+        int r;
+
+        assert(filename);
+        assert(lvalue);
+        assert(rvalue);
+
+        r = config_parse_string(unit, filename, line, section, section_line, lvalue, ltype, rvalue, &tz, userdata);
+        if (r < 0)
+                return r;
+
+        if (!timezone_is_valid(tz)) {
+                log_syntax(unit, LOG_ERR, filename, line, EINVAL, "Timezone is not valid, ignoring assignment: %s", rvalue);
+                free(tz);
+                return 0;
+        }
+
+        free(*timezone);
+        *timezone = tz;
+
+        return 0;
+}
-- 
cgit v1.2.3-54-g00ecf