From: Thomas Markwalder <tmark@isc.org>
Date: Thu, 20 Jun 2019 14:18:56 +0000 (-0400)
Subject: [v4_1_esv] Updated match expression man page text and release notes
X-Git-Tag: v4_1_esv_r16b1~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5330adf52081f8b5c39f6ed8df619549cd58a6d;p=thirdparty%2Fdhcp.git

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

    Merges in 45451.
---

diff --git a/RELNOTES b/RELNOTES
index 2ad223fc0..860a8c5f8 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -105,6 +105,10 @@ dhcp-users@lists.isc.org.
   when building with --enable-use-sockets and --enable-ipv4-pktinfo.
   [ISC-Bugs #36118]
 
+- 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.1-ESV-R15b1
 
 - None
diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5
index 2c4d78dd3..d2734aa4e 100644
--- a/server/dhcpd.conf.5
+++ b/server/dhcpd.conf.5
@@ -880,6 +880,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