From: Thomas Markwalder <tmark@isc.org>
Date: Tue, 1 Sep 2020 17:46:43 +0000 (-0400)
Subject: [#92] Max startup lease size now only checked on 32-bit OSes
X-Git-Tag: v4_4_3b1^2~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e914d00dd9db8d7c4d0a3dd42d8ce68bb030d3b;p=thirdparty%2Fdhcp.git

[#92] Max startup lease size now only checked on 32-bit OSes

modified:
    RELNOTES
    server/confpars.c
---

diff --git a/RELNOTES b/RELNOTES
index bbf81570..2a681989 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -119,6 +119,10 @@ and the client Linux script sample was updated.
   client script exits abnormally (i.e. crashes).
   [Gitlab #123]
 
+- The limit on the size of lease file that can be loaded at start up
+  is now only enforced on 32-bit systems.
+  [Gitlab #64]
+
 		Changes since 4.4.2b1 (Bug Fixes)
 
 - Added a clarification on DHCPINFORMs and server authority to
diff --git a/server/confpars.c b/server/confpars.c
index 4f0b58ee..e2216685 100644
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -3,7 +3,7 @@
    Parser for dhcpd config file... */
 
 /*
- * Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2020 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1995-2003 by Internet Software Consortium
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
@@ -142,7 +142,7 @@ isc_result_t read_conf_file (const char *filename, struct group *group,
 	if (lseek (file, (off_t)0, SEEK_SET) < 0)
 		goto boom;
 	/* Can't handle files greater than 2^31-1. */
-	if (flen > 0x7FFFFFFFUL)
+	if ((sizeof(void*) < 8) && flen > 0x7FFFFFFFUL)
 		log_fatal ("%s: file is too long to buffer.", filename);
 	ulen = flen;