From: Thomas Markwalder <tmark@isc.org>
Date: Fri, 12 Jan 2018 14:54:44 +0000 (-0500)
Subject: [master] Updated match expression man page text and release notes
X-Git-Tag: v4_4_0~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d638452ea1a83e12f61e64fe39838a74e453f40a;p=thirdparty%2Fdhcp.git

[master] Updated match expression man page text and release notes

    Merges in 45451.
---

diff --git a/RELNOTES b/RELNOTES
index 3e0005981..33e8ee44f 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -87,6 +87,12 @@ ISC DHCP is open source software maintained by Internet Systems
 Consortium.  This product includes cryptographic software written
 by Eric Young (eay@cryptsoft.com).
 
+		Changes since 4.4.0b1 (Bug Fixes)
+
+- Added clarifying text to dhcpd.conf.5 explaining the class match expressions
+  cannot rely on the results of executable statements.
+  [ISC-Bugs #45451]
+
 		Changes since 4.4.0a1 (New Features)
 
 - Added experimental support for relay port (draft-ietf-dhc-relay-port-10.txt)
diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5
index b32915d41..878f1b6ce 100644
--- a/server/dhcpd.conf.5
+++ b/server/dhcpd.conf.5
@@ -921,6 +921,12 @@ class "ras-clients" {
 }
 .fi
 .PP
+Please note that the values used in match expressions may only come from
+data or options that are part of the client packet. It is not possible to
+use values constructed through one or more executable statements.  This
+stems from the fact that client classification occurs before any statements
+are executed. Attempting to do so will yield indeterminate results.
+.PP
 Note that whether you use matching expressions or add statements (or
 both) to classify clients, you must always write a class declaration
 for any class that you use.  If there will be no match statement and