summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Markwalder <tmark@isc.org>2019-06-20 10:18:56 -0400
committerThomas Markwalder <tmark@isc.org>2019-06-20 10:18:56 -0400
commita5330adf52081f8b5c39f6ed8df619549cd58a6d (patch)
tree6c177342c312266a531da45679beafe8f8f1da82
parent7c72928ef6fe8541fb0fed4a1b998d83fdd227e5 (diff)
downloadisc-dhcp-a5330adf52081f8b5c39f6ed8df619549cd58a6d.tar.gz
[v4_1_esv] Updated match expression man page text and release notes
Merges in 45451.
-rw-r--r--RELNOTES4
-rw-r--r--server/dhcpd.conf.56
2 files changed, 10 insertions, 0 deletions
diff --git a/RELNOTES b/RELNOTES
index 2ad223fc..860a8c5f 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 2c4d78dd..d2734aa4 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