From 05f76dab89d5b879519a4f45b0cccaa1fc3d162d Mon Sep 17 00:00:00 2001 From: Simon Kelley Date: Tue, 9 May 2017 22:57:04 +0100 Subject: [PATCH] Don't die() on failing to parse lease-script output. --- src/lease.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/lease.c b/src/lease.c index 5afb99b..993472f 100644 --- a/src/lease.c +++ b/src/lease.c @@ -133,7 +133,6 @@ static int read_leases(time_t now, FILE *leasestream) void lease_init(time_t now) { FILE *leasestream; - int readok = 0; leases_left = daemon->dhcp_max; @@ -172,7 +171,7 @@ void lease_init(time_t now) if (leasestream) { - if (!(readok = read_leases(now, leasestream))) + if (!read_leases(now, leasestream)) my_syslog(MS_DHCP | LOG_ERR, _("failed to parse lease database, invalid line: %s %s %s %s ..."), daemon->dhcp_buff3, daemon->dhcp_buff2, daemon->namebuff, daemon->dhcp_buff); @@ -202,12 +201,6 @@ void lease_init(time_t now) sprintf(daemon->dhcp_buff, "%d", WEXITSTATUS(rc)); die(_("lease-init script returned exit code %s"), daemon->dhcp_buff, WEXITSTATUS(rc) + EC_INIT_OFFSET); } - - /* Only die if we stopped reading due to a non-parsed line when running script, - this is expected behaviour when reading from a file, if the file was written with IPv6 data - and we are not compiled to understand that. */ - if (!readok) - die(_("failed to read lease-init script output"), NULL, EC_FILE); } #endif