From 208fb610a697901609bb8fc1cbaabbffe2fc0501 Mon Sep 17 00:00:00 2001 From: Simon Kelley Date: Thu, 21 Feb 2013 22:26:18 +0000 Subject: [PATCH] Fix wrong DNSMASQ_LEASE_EXPIRES envar when luascript in use also. --- src/helper.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/helper.c b/src/helper.c index 0651741..94aabeb 100644 --- a/src/helper.c +++ b/src/helper.c @@ -229,13 +229,6 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) } } - /* expiry or length into dhcp_buff2 */ -#ifdef HAVE_BROKEN_RTC - sprintf(daemon->dhcp_buff2, "%u", data.length); -#else - sprintf(daemon->dhcp_buff2, "%lu", (unsigned long)data.expires); -#endif - /* supplied data may just exceed normal buffer (unlikely) */ if ((data.hostname_len + data.ed_len + data.clid_len) > MAXDNAME && !(alloc_buff = buf = malloc(data.hostname_len + data.ed_len + data.clid_len))) @@ -496,8 +489,10 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) my_setenv("DNSMASQ_INTERFACE", data.interface, &err); #ifdef HAVE_BROKEN_RTC + sprintf(daemon->dhcp_buff2, "%u", data.length); my_setenv("DNSMASQ_LEASE_LENGTH", daemon->dhcp_buff2, &err); #else + sprintf(daemon->dhcp_buff2, "%lu", (unsigned long)data.expires); my_setenv("DNSMASQ_LEASE_EXPIRES", daemon->dhcp_buff2, &err); #endif